Download as
Browse Code »

Commit 307f8268179c0b747b6707b1231dafe0f6cc88c8

Authored by Caio Salgado + Rafael Manzo
Committed by Paulo Meireles
1 parent 690ebf6e
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[Mezuro] refactored create_metric_configuration and create_compound_metric_configuration

Showing 1 changed file with 14 additions and 14 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
  Diff comments   View file @307f826
@@ -43,16 +43,14 @@ class MezuroPluginMyprofileController < ProfileController @@ -43,16 +43,14 @@ class MezuroPluginMyprofileController < ProfileController
43 end 43 end
44 44
45 def create_metric_configuration 45 def create_metric_configuration
46 - @configuration_name = params[:configuration_name]  
47 metric_configuration = new_metric_configuration_instance 46 metric_configuration = new_metric_configuration_instance
48 - Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name) 47 + generic_metric_configuration_creation(metric_configuration)
49 redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}" 48 redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
50 end 49 end
51 50
52 def create_compound_metric_configuration 51 def create_compound_metric_configuration
53 - @configuration_name = params[:configuration_name]  
54 compound_metric_configuration = new_compound_metric_configuration_instance 52 compound_metric_configuration = new_compound_metric_configuration_instance
55 - Kalibro::Client::MetricConfigurationClient.new.save(compound_metric_configuration, @configuration_name) 53 + generic_metric_configuration_creation(compound_metric_configuration)
56 redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}" 54 redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
57 end 55 end
58 56
@@ -137,8 +135,6 @@ class MezuroPluginMyprofileController < ProfileController @@ -137,8 +135,6 @@ class MezuroPluginMyprofileController < ProfileController
137 redirect_to "/#{profile.identifier}/#{configuration_name.downcase.gsub(/\s/, '-')}" 135 redirect_to "/#{profile.identifier}/#{configuration_name.downcase.gsub(/\s/, '-')}"
138 end 136 end
139 137
140 -  
141 -  
142 private 138 private
143 139
144 def new_metric_configuration_instance 140 def new_metric_configuration_instance
@@ -154,26 +150,30 @@ class MezuroPluginMyprofileController < ProfileController @@ -154,26 +150,30 @@ class MezuroPluginMyprofileController < ProfileController
154 end 150 end
155 151
156 def assign_metric_configuration_instance(metric_configuration) 152 def assign_metric_configuration_instance(metric_configuration)
157 - metric_configuration.metric.name = params[:metric_configuration][:metric][:name]  
158 - metric_configuration.metric.description = params[:metric_configuration][:metric][:description] 153 + assign_generic_metric_configuration(metric_configuration)
159 metric_configuration.metric.origin = params[:metric_configuration][:metric][:origin] 154 metric_configuration.metric.origin = params[:metric_configuration][:metric][:origin]
160 - metric_configuration.metric.scope = params[:metric_configuration][:metric][:scope]  
161 metric_configuration.metric.language = params[:metric_configuration][:metric][:language] 155 metric_configuration.metric.language = params[:metric_configuration][:metric][:language]
162 - metric_configuration.code = params[:metric_configuration][:code]  
163 - metric_configuration.weight = params[:metric_configuration][:weight]  
164 - metric_configuration.aggregation_form = params[:metric_configuration][:aggregation_form]  
165 metric_configuration 156 metric_configuration
166 end 157 end
167 158
168 def assign_compound_metric_configuration_instance(metric_configuration) 159 def assign_compound_metric_configuration_instance(metric_configuration)
  160 + assign_generic_metric_configuration(metric_configuration)
  161 + metric_configuration.metric.script = params[:metric_configuration][:metric][:script]
  162 + metric_configuration
  163 + end
  164 +
  165 + def assign_generic_metric_configuration(metric_configuration)
169 metric_configuration.metric.name = params[:metric_configuration][:metric][:name] 166 metric_configuration.metric.name = params[:metric_configuration][:metric][:name]
170 metric_configuration.metric.description = params[:metric_configuration][:metric][:description] 167 metric_configuration.metric.description = params[:metric_configuration][:metric][:description]
171 metric_configuration.metric.scope = params[:metric_configuration][:metric][:scope] 168 metric_configuration.metric.scope = params[:metric_configuration][:metric][:scope]
172 - metric_configuration.metric.script = params[:metric_configuration][:metric][:script]  
173 metric_configuration.code = params[:metric_configuration][:code] 169 metric_configuration.code = params[:metric_configuration][:code]
174 metric_configuration.weight = params[:metric_configuration][:weight] 170 metric_configuration.weight = params[:metric_configuration][:weight]
175 metric_configuration.aggregation_form = params[:metric_configuration][:aggregation_form] 171 metric_configuration.aggregation_form = params[:metric_configuration][:aggregation_form]
176 - metric_configuration 172 + end
  173 +
  174 + def generic_metric_configuration_creation(metric_configuration)
  175 + @configuration_name = params[:configuration_name]
  176 + Kalibro::Client::MetricConfigurationClient.new.save(metric_configuration, @configuration_name)
177 end 177 end
178 178
179 def new_range_instance 179 def new_range_instance