Download as
Browse Code »

Commit 4b7a05d3d76b5db686d6a25b7e8a2f0778719ab4

Authored by João M. M. da Silva
2 parents 4e40114e 8eac1988
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

Merge branch 'x_axis' of gitorious.org:+mezuro/noosfero/mezuro into x_axis 

Conflicts:
	plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
	plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
	plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
	plugins/mezuro/views/mezuro_plugin_myprofile/_range_form.html.erb
Showing 2 changed files with 11 additions and 9 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
  Diff comments   View file @4b7a05d
@@ -60,7 +60,7 @@ class MezuroPluginMyprofileController < ProfileController @@ -60,7 +60,7 @@ class MezuroPluginMyprofileController < ProfileController
60 redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}" 60 redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
61 end 61 end
62 end 62 end
63 - 63 +
64 def create_compound_metric_configuration 64 def create_compound_metric_configuration
65 id = params[:id] 65 id = params[:id]
66 metric_name = params[:metric_configuration][:metric][:name] 66 metric_name = params[:metric_configuration][:metric][:name]
@@ -108,33 +108,35 @@ class MezuroPluginMyprofileController < ProfileController @@ -108,33 +108,35 @@ class MezuroPluginMyprofileController < ProfileController
108 redirect_to "/#{profile.identifier}/#{configuration_content.slug}" 108 redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
109 end 109 end
110 end 110 end
111 - 111 +
112 def new_range 112 def new_range
113 @configuration_content = profile.articles.find(params[:id]) 113 @configuration_content = profile.articles.find(params[:id])
114 @metric_name = params[:metric_name] 114 @metric_name = params[:metric_name]
115 @range = Kalibro::Range.new 115 @range = Kalibro::Range.new
  116 + @range_color = "#000000"
116 end 117 end
117 - 118 +
118 def edit_range 119 def edit_range
119 @configuration_content = profile.articles.find(params[:id]) 120 @configuration_content = profile.articles.find(params[:id])
120 @metric_name = params[:metric_name] 121 @metric_name = params[:metric_name]
121 @beginning_id = params[:beginning_id] 122 @beginning_id = params[:beginning_id]
122 metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, @metric_name) 123 metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, @metric_name)
123 @range = metric_configuration.ranges.find{|range| range.beginning == @beginning_id.to_f || @beginning_id =="-INF" } 124 @range = metric_configuration.ranges.find{|range| range.beginning == @beginning_id.to_f || @beginning_id =="-INF" }
  125 + @range_color = "#" + @range.color.to_s.gsub(/^ff/, "")
124 end 126 end
125 127
126 def create_range 128 def create_range
127 @configuration_content = profile.articles.find(params[:id]) 129 @configuration_content = profile.articles.find(params[:id])
128 @range = Kalibro::Range.new params[:range] 130 @range = Kalibro::Range.new params[:range]
129 metric_name = params[:metric_name] 131 metric_name = params[:metric_name]
130 - metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name) 132 + metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
131 metric_configuration.add_range(@range) 133 metric_configuration.add_range(@range)
132 metric_configuration.save 134 metric_configuration.save
133 if metric_configuration_has_errors? metric_configuration 135 if metric_configuration_has_errors? metric_configuration
134 redirect_to_error_page metric_configuration.errors[0].message 136 redirect_to_error_page metric_configuration.errors[0].message
135 end 137 end
136 end 138 end
137 - 139 +
138 def update_range 140 def update_range
139 configuration_content = profile.articles.find(params[:id]) 141 configuration_content = profile.articles.find(params[:id])
140 metric_name = params[:metric_name] 142 metric_name = params[:metric_name]
@@ -147,7 +149,7 @@ class MezuroPluginMyprofileController < ProfileController @@ -147,7 +149,7 @@ class MezuroPluginMyprofileController < ProfileController
147 redirect_to_error_page metric_configuration.errors[0].message 149 redirect_to_error_page metric_configuration.errors[0].message
148 end 150 end
149 end 151 end
150 - 152 +
151 def remove_range 153 def remove_range
152 configuration_content = profile.articles.find(params[:id]) 154 configuration_content = profile.articles.find(params[:id])
153 metric_name = params[:metric_name] 155 metric_name = params[:metric_name]
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @4b7a05d
@@ -36,7 +36,7 @@ class MezuroPluginProfileController < ProfileController @@ -36,7 +36,7 @@ class MezuroPluginProfileController < ProfileController
36 else 36 else
37 render :partial => 'content_viewer/project_result' 37 render :partial => 'content_viewer/project_result'
38 end 38 end
39 - end 39 + end
40 40
41 def module_result 41 def module_result
42 @content = profile.articles.find(params[:id]) 42 @content = profile.articles.find(params[:id])
@@ -87,9 +87,9 @@ class MezuroPluginProfileController < ProfileController @@ -87,9 +87,9 @@ class MezuroPluginProfileController < ProfileController
87 render :partial => 'content_viewer/score_history' 87 render :partial => 'content_viewer/score_history'
88 end 88 end
89 end 89 end
90 - 90 +
91 private 91 private
92 - 92 +
93 def filtering_metric_history(metric_name, module_history) 93 def filtering_metric_history(metric_name, module_history)
94 metrics_history = module_history.map do |module_result| 94 metrics_history = module_history.map do |module_result|
95 [module_result.metric_results, format_date_to_simple_form(module_result.date)] 95 [module_result.metric_results, format_date_to_simple_form(module_result.date)]