summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-17 12:31:28 +0100
committerspag <spag@golwen.net>2013-01-17 12:31:28 +0100
commit808a9d19c7376907370e58662856cd028e9b83b1 (patch)
treea005f8c1bb1016d8d1b4218772542da780bd7740
parentae8ce84e44d776b3c2318795ceff611f0639b7ec (diff)
route elements views
-rw-r--r--app/views/route_elements/_form_core.html.haml3
-rw-r--r--app/views/route_elements/_index_core.html.haml2
-rw-r--r--app/views/route_elements/show.html.haml3
3 files changed, 1 insertions, 7 deletions
diff --git a/app/views/route_elements/_form_core.html.haml b/app/views/route_elements/_form_core.html.haml
index 133d1df..a9a38a7 100644
--- a/app/views/route_elements/_form_core.html.haml
+++ b/app/views/route_elements/_form_core.html.haml
@@ -3,6 +3,5 @@
= f.input :var_out, :label => t('route_elements.form.var_out.label'), :hint => conditional_hint('route_elements.form.var_out.hint')
= f.input :pattern, :label => t('route_elements.form.pattern.label'), :hint => conditional_hint('route_elements.form.pattern.hint')
= f.input :replacement, :label => t('route_elements.form.replacement.label'), :hint => conditional_hint('route_elements.form.replacement.hint')
- = f.input :action, :label => t('route_elements.form.action.label'), :hint => conditional_hint('route_elements.form.action.hint')
+ = f.input :action, :collection => RouteElement::ELEMENT_ACTIONS, :label => t('route_elements.form.action.label'), :hint => conditional_hint('route_elements.form.action.hint'), :include_blank => false
= f.input :mandatory, :label => t('route_elements.form.mandatory.label'), :hint => conditional_hint('route_elements.form.mandatory.hint')
- = f.input :position, :label => t('route_elements.form.position.label'), :hint => conditional_hint('route_elements.form.position.hint')
diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml
index c1df665..3435686 100644
--- a/app/views/route_elements/_index_core.html.haml
+++ b/app/views/route_elements/_index_core.html.haml
@@ -6,7 +6,6 @@
%th= t('route_elements.index.replacement')
%th= t('route_elements.index.action')
%th= t('route_elements.index.mandatory')
- %th= t('route_elements.index.position')
- reset_cycle
- for route_element in route_elements
@@ -17,5 +16,4 @@
%td= route_element.replacement
%td= route_element.action
%td= route_element.mandatory
- %td= route_element.position
=render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @call_route, :child => route_element} \ No newline at end of file
diff --git a/app/views/route_elements/show.html.haml b/app/views/route_elements/show.html.haml
index 8e41f80..c637a4d 100644
--- a/app/views/route_elements/show.html.haml
+++ b/app/views/route_elements/show.html.haml
@@ -18,8 +18,5 @@
%p
%strong= t('route_elements.show.mandatory') + ":"
= @route_element.mandatory
-%p
- %strong= t('route_elements.show.position') + ":"
- = @route_element.position
= render :partial => 'shared/show_edit_destroy_part', :locals => {:parent => @call_route, :child => @route_element } \ No newline at end of file