Download as
Browse Code »

Commit dbf169af5efeed180c0e010726d47e355a78ec11

Authored by João M. M. da Silva
Committed by Paulo Meireles
1 parent a7daad1b
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

[Mezuro] removing and editing range in a metric configuration.

Showing 3 changed files with 11 additions and 8 deletions   Show diff stats
plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb
  Diff comments   View file @dbf169a
@@ -9,9 +9,11 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController @@ -9,9 +9,11 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController
9 end 9 end
10 10
11 def edit_range 11 def edit_range
12 - @range = Kalibro::Range.new(params[:range])  
13 @content_id = params[:id] 12 @content_id = params[:id]
14 @metric_configuration_id = params[:metric_configuration_id] 13 @metric_configuration_id = params[:metric_configuration_id]
  14 + ranges = Kalibro::Range.ranges_of params[:metric_configuration_id]
  15 + @range = (ranges.select { |range| range.id == params[:range_id].to_i }).first
  16 + @reading_labels_and_ids = reading_labels_and_ids
15 end 17 end
16 18
17 def create_range 19 def create_range
@@ -35,11 +37,12 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController @@ -35,11 +37,12 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController
35 def remove_range 37 def remove_range
36 configuration_content_id = params[:id] 38 configuration_content_id = params[:id]
37 metric_configuration_id = params[:metric_configuration_id] 39 metric_configuration_id = params[:metric_configuration_id]
38 - Kalibro::Range.new(params[:range]).destroy  
39 - if metric_configuration.metric.compound  
40 - redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_compound_metric_configuration?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}" 40 + compound = params[:compound]
  41 + Kalibro::Range.new({:id => params[:range_id]}).destroy
  42 + if compound
  43 + redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_compound?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}"
41 else 44 else
42 - redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_native_metric_configuration?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}" 45 + redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/metric_configuration/edit_native?id=#{configuration_content_id}&metric_configuration_id=#{metric_configuration_id}"
43 end 46 end
44 end 47 end
45 48
plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_native.html.erb
  Diff comments   View file @dbf169a
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 </tr> 36 </tr>
37 <% @ranges.each do |range| %> 37 <% @ranges.each do |range| %>
38 <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id, 38 <%= render :partial => "mezuro_plugin_range/range", :locals => {:range => range, :id => @configuration_content.id,
39 - :metric_configuration_id => @metric_configuration.id} %> 39 + :metric_configuration_id => @metric_configuration.id, :reading_group_id => @metric_configuration.reading_group_id, :compound => @metric_configuration.metric.compound} %>
40 <% end %> 40 <% end %>
41 </table> 41 </table>
42 42
plugins/mezuro/views/mezuro_plugin_range/_range.html.erb
  Diff comments   View file @dbf169a
@@ -13,9 +13,9 @@ @@ -13,9 +13,9 @@
13 </td> 13 </td>
14 <td bgcolor="#<%= range.color %>"></td> 14 <td bgcolor="#<%= range.color %>"></td>
15 <% if (not user.nil?) && user.id == @profile.id %> 15 <% if (not user.nil?) && user.id == @profile.id %>
16 - <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id} %> 16 + <td><%= link_to_remote "Edit", :url => {:action =>"edit_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :reading_group_id => reading_group_id} %>
17 </td> 17 </td>
18 - <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id %> 18 + <td><%= link_to "Remove", :action =>"remove_range", :controller => "mezuro_plugin_range", :id => params[:id], :metric_configuration_id => params[:metric_configuration_id], :range_id => range.id, :compound => compound %>
19 </td> 19 </td>
20 <% else %> 20 <% else %>
21 <td></td> 21 <td></td>