Fixed alphabetical order in labels table

refactored

Refactoring

make labels sorted

changed methods for consistency

changed method for vm_helper labels

cleaning up dead code and moving some methods

refactoring

refactoring

app/helpers/container_summary_helper.rb

@@ -1,6 +1,5 @@
 module ContainerSummaryHelper
   include TextualMixins::TextualName
-
   def textual_ems
     textual_link(@record.ext_management_system)
   end
@@ -187,10 +186,4 @@ def collect_env
       ]
     end
   end
-
-  private
-
-  def textual_key_value_group(items)
-    items.collect { |item| {:label => item.name.to_s, :value => item.value.to_s} }
-  end
 end

app/helpers/textual_summary_helper.rb

@@ -48,6 +48,11 @@ def textual_group_render_options(group_symbol)
     }
   end
 
+  def textual_key_value_group(items)
+    res = items.collect { |item| {:label => item.name.to_s, :value => item.value.to_s} }
+    res.sort_by { |k| k[:label] }
+  end
+
   def textual_tags
     label = _("%{name} Tags") % {:name => session[:customer_name]}
     h = {:label => label}

app/helpers/vm_helper/textual_summary.rb

@@ -107,7 +107,7 @@ def textual_group_ems_custom_attributes
   end
 
   def textual_group_labels
-    TextualGroup.new(_("Labels"), textual_labels)
+    TextualGroup.new(_("Labels"), textual_key_value_group(@record.custom_attributes))
   end
 
   def textual_group_power_management
@@ -762,12 +762,6 @@ def textual_ems_custom_attributes
     attrs.sort_by(&:name).collect { |a| {:label => a.name, :value => a.value} }
   end
 
-  def textual_labels
-    attrs = @record.custom_attributes
-    return nil if attrs.blank?
-    attrs.sort_by(&:name).collect { |a| {:label => a.name, :value => a.value} }
-  end
-
   def textual_compliance_history
     super(:title    => _("Show Compliance History of this VM (Last 10 Checks)"),
           :explorer => true)