SONAR-3432 Prepare for shared code

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
index c8230344b33ec34374e5e726621982d5b2be18fb..1dc049c3569b8032d7c768c54fca08c33f13b309 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/dashboard_helper.rb
@@ -18,7 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
 #
 module DashboardHelper
-  include PropertiesHelper
+  include WidgetPropertiesHelper
   include MetricsHelper
   include FiltersHelper
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/properties_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/properties_helper.rb
index cf5c2fcb6b35f321bcca87a8499632760511c738..1f94cbf7c877568ccd3877569e7b32c589527974 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/properties_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/properties_helper.rb
@@ -19,51 +19,42 @@
 #
 module PropertiesHelper
 
-  def property_value_field(definition, value)
-    val=value || definition.defaultValue()
+  def property_value(key, type, value)
+    if type==PropertyType::TYPE_INTEGER
+      text_field_tag key, value, :size => 10
 
-    if definition.type.name()==PropertyType::TYPE_INTEGER
-      text_field_tag definition.key(), val, :size => 10
+    elsif type==PropertyType::TYPE_BOOLEAN
+      check_box_tag key, "true", value=='true'
 
-    elsif definition.type.name()==PropertyType::TYPE_BOOLEAN
-      check_box_tag definition.key(), "true", val=='true'
+    elsif type==PropertyType::TYPE_FLOAT
+      text_field_tag key, value, :size => 10
 
-    elsif definition.type.name()==PropertyType::TYPE_FLOAT
-      text_field_tag definition.key(), val, :size => 10
+    elsif type==PropertyType::TYPE_STRING
+      text_field_tag key, value, :size => 10
 
-    elsif definition.type.name()==PropertyType::TYPE_STRING
-      text_field_tag definition.key(), val, :size => 10
+    elsif type==PropertyType::TYPE_METRIC
+      select_tag key, options_grouped_by_domain(Metric.all.select{|m| m.display?}.sort_by(&:short_name), value, :include_empty => true)
 
-    elsif definition.type.name()==PropertyType::TYPE_METRIC
-      select_tag definition.key(), options_grouped_by_domain(Metric.all.select{|m| m.display?}.sort_by(&:short_name), val, :include_empty => true)
-
-    elsif definition.type.name()==PropertyType::TYPE_FILTER
+    elsif type==PropertyType::TYPE_FILTER
       user_filters = options_key(value, ::Filter.find(:all, :conditions => ['user_id=?', current_user.id]).sort_by(&:id))
       shared_filters = options_key(value, ::Filter.find(:all, :conditions => ['(user_id<>? or user_id is null) and shared=?', current_user.id, true]).sort_by(&:id))
 
-      filters_combo = select_tag definition.key(), option_group('My Filters', user_filters) + option_group('Shared Filters', shared_filters)
+      filters_combo = select_tag key, option_group('My Filters', user_filters) + option_group('Shared Filters', shared_filters)
       filter_link = link_to message('widget.filter.edit'), {:controller => :filters, :action => :manage}, :class => 'link-action'
 
       "#{filters_combo} #{filter_link}"
 
-    elsif definition.type.name()==PropertyType::TYPE_TEXT
-      text_area_tag definition.key(), val, :size => '40x6'
+    elsif type==PropertyType::TYPE_TEXT
+      text_area_tag key, value, :size => '40x6'
 
-    elsif definition.type.name()==PropertyType::TYPE_PASSWORD
-      password_field_tag definition.key(), val, :size => 10
+    elsif type==PropertyType::TYPE_PASSWORD
+      password_field_tag key, value, :size => 10
 
     else
-      hidden_field_tag definition.key()
+      hidden_field_tag key
     end
   end
 
-  def resource_value_field(value)
-    projects = Project.all(:conditions => {:scope => 'PRJ', :qualifier => 'TRK', :enabled => true})
-    sorted_projects = Api::Utils.insensitive_sort(projects, &:name)
-
-    select_tag 'resource_id', options_id(value, sorted_projects)
-  end
-
   def options_id(value, values)
     values.collect { |f| "<option value='#{f.id}'" + (value.to_s == f.id.to_s ? " selected='selected'" : "") + ">#{h(f.name)}</option>" }.to_s
   end

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
new file mode 100644 (file)
index 0000000..39a3508
--- /dev/null
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/widget_properties_helper.rb
@@ -0,0 +1,34 @@
+#
+# Sonar, entreprise quality control tool.
+# Copyright (C) 2008-2012 SonarSource
+# mailto:contact AT sonarsource DOT com
+#
+# Sonar is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 3 of the License, or (at your option) any later version.
+#
+# Sonar is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with Sonar; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+#
+module WidgetPropertiesHelper
+  include PropertiesHelper
+
+  def property_value_field(definition, value)
+    property_value(definition.key(), definition.type.name(), value || definition.defaultValue())
+  end
+
+  def resource_value_field(value)
+    projects = Project.all(:conditions => {:scope => 'PRJ', :qualifier => 'TRK', :enabled => true})
+    sorted_projects = Api::Utils.insensitive_sort(projects, &:name)
+
+    select_tag 'resource_id', options_id(value, sorted_projects)
+  end
+
+end