CustomButtons: deduplicate expression partials.

app/views/layouts/_custom_button_expression.html.haml

@@ -0,0 +1,25 @@
+-# expression_type 
+- table_key = "#{expression_type}_table".to_sym
+
+.div{:id => "form_#{expression_type}_div"}
+  - if @expkey == expression_type
+    %h3= title + _("(Choose an element of the expression to edit)")
+    = render :partial => 'layouts/exp_editor'
+  - else
+    %h3= title + _('(Press the "Edit" button to edit the expression)')
+    = link_to(image_tag('toolbars/edit.png', :border => "0", :alt => (t = _("Edit this Expression"))),
+      {:action => 'button_update', :button => expression_type},
+      {"data-miq_sparkle_on" => true, "data-miq_sparkle_off" => true, :remote => true, "data-method" => :post, :title => t})
+    %br
+    - if @edit[table_key].nil?
+      = render :partial => 'layouts/info_msg',
+               :locals  => {:message => _("No enablement expression defined.")}
+    - else
+      - @edit[table_key].each do |token|
+        - if !["AND", "OR", "(", ")"].include?([token].flatten.first)
+          = h([token].flatten.first)
+        - else
+          %font{:color => "black"}
+            %b
+              = h([token].flatten.first)
+

app/views/layouts/_role_enablement_expression.html.haml

@@ -1,21 +1,3 @@
-#form_enablement_expression_div
-  - if @expkey == :enablement_expression
-    %h3= _("Enablement Expression (Choose an element of the expression to edit)")
-    = render :partial => 'layouts/exp_editor'
-  - else
-    %h3= _('Enablement Expression (Press the "Edit" button to edit the expression)')
-    = link_to(image_tag('toolbars/edit.png', :border => "0", :alt => (t = _("Edit this Expression"))),
-      {:action => 'button_update', :button => "enablement_expression"},
-      {"data-miq_sparkle_on"  => true, "data-miq_sparkle_off" => true, :remote => true, "data-method" => :post, :title => t})
-    %br
-    - if @edit[:enablement_expression_table].nil?
-      = render :partial => 'layouts/info_msg',
-               :locals  => {:message => _("No enablement expression defined.")}
-    - else
-      - @edit[:enablement_expression_table].each do |token|
-        - if !["AND", "OR", "(", ")"].include?([token].flatten.first)
-          = h([token].flatten.first)
-        - else
-          %font{:color => "black"}
-            %b
-              = h([token].flatten.first)
+= render :partial => 'layouts/custom_button_expression', 
+         :locals => {:expression_type => :enablement_expression,
+                     :title => _('Enablement Expression')}

app/views/layouts/_role_visibility_expression.html.haml

@@ -1,21 +1,3 @@
-#form_visibility_expression_div
-  - if @expkey == :visibility_expression
-    %h3= _("Visibility Expression (Choose an element of the expression to edit)")
-    = render :partial => 'layouts/exp_editor'
-  - else
-    %h3= _('Visibility Expression (Press the "Edit" button to edit the expression)')
-    = link_to(image_tag('toolbars/edit.png', :border => "0", :alt => (t = _("Edit this Expression"))),
-      {:action => 'button_update', :button => "visibility_expression"},
-      {"data-miq_sparkle_on"  => true, "data-miq_sparkle_off" => true, :remote => true, "data-method" => :post, :title => t})
-    %br
-    - if @edit[:visibility_expression_table].nil?
-      = render :partial => 'layouts/info_msg',
-               :locals  => {:message => _("No visibility expression defined.")}
-    - else
-      - @edit[:visibility_expression_table].each do |token|
-        - if !["AND", "OR", "(", ")"].include?([token].flatten.first)
-          = h([token].flatten.first)
-        - else
-          %font{:color => "black"}
-            %b
-              = h([token].flatten.first)
+= render :partial => 'layouts/custom_button_expression',
+         :locals => {:expression_type => :visibility_expression,
+                     :title => _('Visibility Expression')}