more polymorphic objects

3 files changed, 3 insertions, 21 deletions

diff --git a/app/views/call_forwards/_form_core.html.haml b/app/views/call_forwards/_form_core.html.haml
index b751fb3..83de044 100644
--- a/app/views/call_forwards/_form_core.html.haml
+++ b/app/views/call_forwards/_form_core.html.haml
@@ -1,5 +1,5 @@
 .inputs
-  = f.input :call_forward_case_id, :as => :select, :collection => @available_call_forward_cases.map {|x| [I18n.t("call_forward_cases.#{x.value}"), x.id] }, :label => t('call_forwards.form.call_forward_case_id.label'), :hint => conditional_hint('call_forwards.form.call_forward_case_id.hint'), :include_blank => false, :autofocus => true
+  = f.input :call_forward_case_id, :as => :select, :collection => @available_call_forward_cases.map {|x| [I18n.t("call_forward_cases.#{x.value}"), x.id] }, :label => t('call_forwards.form.call_forward_case.label'), :hint => conditional_hint('call_forwards.form.call_forward_case_id.hint'), :include_blank => false, :autofocus => true
   = f.input :timeout, :label => t('call_forwards.form.timeout.label'), :hint => conditional_hint('call_forwards.form.timeout.hint')
   
   = f.input :call_forwarding_destination , :as => :select, :collection => @call_forwarding_destinations, :label => t('call_forwards.form.call_forwarding_destination.label'), :hint => conditional_hint('call_forwards.form.call_forwarding_destination.hint'), :include_blank => false
@@ -8,8 +8,4 @@
 
 
   = f.input :source, :label => t('call_forwards.form.source.label'), :hint => conditional_hint('call_forwards.form.source.hint')
-  - if GuiFunction.display?('depth_field_in_call_forward_form', current_user)
-    = f.input :depth, :collection => 1..GsParameter.get('MAX_CALL_FORWARD_DEPTH'), :label => t('call_forwards.form.depth.label'), :hint => conditional_hint('call_forwards.form.depth.hint')
-  - else
-    = f.hidden_field :depth
   = f.input :active, :label => t('call_forwards.form.active.label'), :hint => conditional_hint('call_forwards.form.active.hint')
diff --git a/app/views/call_forwards/_index_core.html.haml b/app/views/call_forwards/_index_core.html.haml
index 48afa54..221baf2 100644
--- a/app/views/call_forwards/_index_core.html.haml
+++ b/app/views/call_forwards/_index_core.html.haml
@@ -1,21 +1,15 @@
 %table.table.table-striped
   %thead
     %tr
-      - if !@phone_number
-        %th= t('call_forwards.index.call_forwardable')
-      %th= t('call_forwards.index.call_forward_case_id')
+      %th= t('call_forwards.index.call_forward_case')
       %th= t('call_forwards.index.timeout')
       %th= t('call_forwards.index.destination')
       %th= t('call_forwards.index.source')
-      - if GuiFunction.display?('depth_field_value_in_index_table', current_user)
-        %th= t('call_forwards.index.depth')
       %th= t('call_forwards.index.active')
 
   %tbody
     - for call_forward in call_forwards
       %tr
-        - if !@phone_number
-          %td= call_forward.call_forwardable
         %td= t("call_forward_cases.#{call_forward.call_forward_case.value}")
         %td= call_forward.timeout
         %td
@@ -26,7 +20,5 @@
             - if call_forward.destinationable_id
               = ": #{call_forward.destinationable}"
         %td= call_forward.source
-        - if GuiFunction.display?('depth_field_value_in_index_table', current_user)
-          %td= call_forward.depth
         %td= call_forward.active
         =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => call_forward.call_forwardable, :child => call_forward}
\ No newline at end of file
diff --git a/app/views/call_forwards/show.html.haml b/app/views/call_forwards/show.html.haml
index 9f9d27a..ad9ab16 100644
--- a/app/views/call_forwards/show.html.haml
+++ b/app/views/call_forwards/show.html.haml
@@ -1,9 +1,6 @@
 - content_for :title, t("call_forwards.show.page_title")
 
 %p
-  %strong= t('call_forwards.show.call_forwardable') + ":"
-  = "#{@call_forward.call_forwardable_type}: #{@call_forward.call_forwardable}"
-%p
   %strong= t('call_forwards.show.call_forward_case') + ":"
   = t("call_forward_cases.#{@call_forward.call_forward_case.value}") 
 %p
@@ -22,10 +19,7 @@
   %strong= t('call_forwards.show.source') + ":"
   = @call_forward.source
 %p
-  %strong= t('call_forwards.show.depth') + ":"
-  = @call_forward.depth
-%p
   %strong= t('call_forwards.show.active') + ":"
   = @call_forward.active
 
-= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @parent, :child => @call_forward }
\ No newline at end of file
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @parent, :child => @call_forward }