Merge branch 'develop'5.1-beta2

3 files changed, 33 insertions, 26 deletions

diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
index 5dc7c21..f0acebb 100644
--- a/app/views/call_routes/_index_core.html.haml
+++ b/app/views/call_routes/_index_core.html.haml
@@ -1,21 +1,27 @@
 - cache(['call_routes_table', call_routes.count, call_routes.reorder(:updated_at).last]) do 
-  %table{:class => 'table table-striped'}
-    %tr
-      %th= t('call_routes.index.name')
-      %th= t('route_elements.index.pattern')
-      %th= t('call_routes.index.endpoint_type')
-      %th{:colspan => '3'}
-    
-    - for call_route in call_routes
-      - cache(['call_route_single_table_row', call_route, call_routes.count]) do 
-        %tr
-          %td= call_route.name
-          %td
-            - if call_route.route_elements.any?
-              = call_route.route_elements.first.pattern
-              - if call_route.route_elements.count > 1
-                = ', ...'
-            - else
-              = '-'
-          %td= call_route.endpoint_type
-          =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
\ No newline at end of file
+  %table.table.table-striped
+    %thead
+      %tr
+        %th= t('call_routes.index.name')
+        %th= t('route_elements.index.pattern')
+        %th= t('call_routes.index.endpoint')
+
+    %tbody
+      - for call_route in call_routes
+        - cache(['call_route_single_table_row', call_route, call_routes.count]) do 
+          %tr
+            %td= call_route.name
+            %td
+              - if call_route.route_elements.any?
+                = call_route.route_elements.first.pattern
+                - if call_route.route_elements.count > 1
+                  = ', ...'
+              - else
+                = '-'
+            %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/index.html.haml b/app/views/call_routes/index.html.haml
index bd4468c..488e1c7 100644
--- a/app/views/call_routes/index.html.haml
+++ b/app/views/call_routes/index.html.haml
@@ -1,7 +1,7 @@
 - content_for :title, t("call_routes.index.page_title")
 
 - if @call_routes && @call_routes.count > 0
-  %table{:class => 'table table-striped'}
+  %table.table.table-striped
     - @routing_tables.each do |routing_table|
       %tr
         %td{:colspan => 3}
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 }