summaryrefslogtreecommitdiff
path: root/app/views/calls
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-07 11:37:03 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-03-07 11:37:03 +0100
commit11f186a118285fbc87a536af26730780a9ad01f5 (patch)
treefe6363b036f60f238916d070b3d0cb0625dd53c8 /app/views/calls
parent2b94b16ee1201d15b3b9d66e142df311141a47db (diff)
parent3e19646f46c772e10ed3d7a45e8c974ab23f625b (diff)
Merge branch 'develop'5.1.1
Diffstat (limited to 'app/views/calls')
-rw-r--r--app/views/calls/_form_core.html.haml2
-rw-r--r--app/views/calls/_index_core.html.haml10
2 files changed, 6 insertions, 6 deletions
diff --git a/app/views/calls/_form_core.html.haml b/app/views/calls/_form_core.html.haml
index 4cdd55e..ec795f2 100644
--- a/app/views/calls/_form_core.html.haml
+++ b/app/views/calls/_form_core.html.haml
@@ -1,2 +1,2 @@
.inputs
- = f.input :dest, :as => :string, :label => t('calls.form.destination.label'), :hint => conditional_hint('calls.form.destination.hint'), :autofocus => true
+ = f.input :destination, :as => :string, :label => t('calls.form.destination.label'), :hint => conditional_hint('calls.form.destination.hint'), :autofocus => true
diff --git a/app/views/calls/_index_core.html.haml b/app/views/calls/_index_core.html.haml
index e5b769e..5ed5538 100644
--- a/app/views/calls/_index_core.html.haml
+++ b/app/views/calls/_index_core.html.haml
@@ -19,17 +19,17 @@
- else
%i.icon-arrow-right
%td
- = call.created
+ = l Time.at(call.start_stamp), :format => :short
%td
- = call.dest
+ = call.destination
%td
- = "#{call.cid_name} #{call.cid_num}"
+ = "#{call.caller_id_name} #{call.caller_id_number}"
%td
- = "#{call.callee_name} #{call.callee_num}"
+ = "#{call.callee_name} #{call.callee_number}"
%td
= call.callstate
%td
- = "#{call.read_codec}/#{call.write_codec}"
+ = "#{call.read_codec}/#{call.read_rate}:#{call.write_codec}/#{call.write_rate}"
%td
%p