summaryrefslogtreecommitdiff
path: root/app/views/call_routes
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-28 11:09:39 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-01-28 11:09:39 +0100
commitbcdd0a3584f23438257619ee4081949c1e653c91 (patch)
tree3dbdf93b00b39ab77ff520fe68f05847d59e46bb /app/views/call_routes
parentcdde455a50df5de70ee3d84ce66733e8769db05f (diff)
parent553115fd50ef3c35d961fa98abfd593386da5c94 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/call_routes')
-rw-r--r--app/views/call_routes/_index_core.html.haml11
-rw-r--r--app/views/call_routes/show.html.haml11
2 files changed, 14 insertions, 8 deletions
diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index 2e9238e..f0acebb 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -4,7 +4,7 @@
%tr
%th= t('call_routes.index.name')
%th= t('route_elements.index.pattern')
- %th= t('call_routes.index.endpoint_type')
+ %th= t('call_routes.index.endpoint')
%tbody
- for call_route in call_routes
@@ -18,5 +18,10 @@
= ', ...'
- else
= '-'
- %td= call_route.endpoint_type
- =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route} \ No newline at end of file
+ %td
+ - endpoint = call_route.endpoint
+ - if endpoint
+ = endpoint
+ - else
+ = call_route.endpoint_type
+ =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml
index 70fe13e..09daf53 100644
--- a/app/views/call_routes/show.html.haml
+++ b/app/views/call_routes/show.html.haml
@@ -7,11 +7,12 @@
%strong= t('call_routes.show.name') + ":"
= @call_route.name
%p
- %strong= t('call_routes.show.endpoint_type') + ":"
- = @call_route.endpoint_type
-%p
- %strong= t('call_routes.show.endpoint_id') + ":"
- = @call_route.endpoint_id
+ %strong= t('call_routes.show.endpoint') + ":"
+ - endpoint = @call_route.endpoint
+ - if endpoint
+ = endpoint
+ - else
+ = @call_route.endpoint_type
= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @call_route }