Download as
Browse Code »

Commit 87eafae06d715ed468ebbb8323144be23c8697e7

Authored by Alessandro Palmeira + João M. M. da Silva
Committed by Alessandro Palmeira
1 parent 26c86683
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] Fixed languages array problem and removed fakes

Showing 3 changed files with 18 additions and 33 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @87eafae
... ... @@ -58,22 +58,9 @@ class MezuroPluginProfileController < ProfileController
58 58 end
59 59  
60 60 def edit_metric_configuration
61   - @metric_configuration_code = params[:metric_code]
62 61 @configuration_name = params[:configuration_name]
63   - @metric_configuration = Kalibro::Entities::MetricConfiguration.new
64   - @metric_configuration.code = @metric_configuration_code
65   - @metric_configuration.aggregation_form = "MEDIAN"
66   - @metric_configuration.weight = "1"
67   - @metric_configuration.metric = Kalibro::Entities::NativeMetric.new
68   - @metric_configuration.metric.name = "Nome falso"
69   - @metric_configuration.metric.origin = "Origem Falsa"
70   - range = Kalibro::Entities::Range.new
71   - range.beginning = "0"
72   - range.end = "100"
73   - range.label = "fake label"
74   - range.grade = "100"
75   - range.color = "FFFFFF"
76   - @metric_configuration.range = [range]
  62 + metric_name = params[:metric_name]
  63 + @metric_configuration = Kalibro::Client::MetricConfigurationClient.new.metric_configuration(@configuration_name, metric_name)
77 64 end
78 65  
79 66 def create_metric_configuration
... ... @@ -96,6 +83,7 @@ class MezuroPluginProfileController < ProfileController
96 83  
97 84 def update_metric_configuration
98 85 @configuration_name = params[:configuration_name]
  86 + # raise @configuration_name.inspect
99 87 redirect_to "/#{profile.identifier}/#{@configuration_name.downcase.gsub(/\s/, '-')}"
100 88 end
101 89  
... ...
plugins/mezuro/views/content_viewer/show_configuration.rhtml
  Diff comments   View file @87eafae
1 1 <% @configuration_content = @page
2   -@configuration = Kalibro::Entities::Configuration.new
3   -@configuration.name = @configuration_content.name
4   -@configuration.description = @configuration_content.description
5   -@fake_metric_configuration = Kalibro::Entities::MetricConfiguration.new
6   -@fake_metric_configuration.metric = {:name => "fake_name", :origin => "Analizo"}
7   -@fake_metric_configuration.code = "fake_code"
8   -@configuration.metric_configurations = [@fake_metric_configuration] %>
  2 +@configuration = Kalibro::Client::ConfigurationClient.new.configuration(@configuration_content.name) %>
9 3  
10 4 <table id="project_info">
11 5 <tr>
... ... @@ -18,25 +12,24 @@
18 12 </tr>
19 13 </table>
20 14  
21   -
22 15 <br/>
23 16  
24   -<%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_profile", :action => "choose_base_tool", :params =>
25   -{:configuration_name => @configuration.name} %><br/>
  17 +<%= link_to "#{image_tag ('/plugins/mezuro/images/plus.png')}Add Metric", :controller => "mezuro_plugin_profile",
  18 +:action => "choose_base_tool", :params => {:configuration_name => @configuration.name} %><br/>
26 19  
27 20 <table>
28   -<% @configuration.metric_configurations.each do |metric_configuration| %>
29   - <tr class="titles">
30   - <td><h5>Metric Name</h5></td>
31   - <td><h5>Collector Name</h5></td>
32   - <td><h5>Metric Code</h5></td>
33   - </tr>
  21 + <tr class="titles">
  22 + <td><h5>Metric Name</h5></td>
  23 + <td><h5>Collector Name</h5></td>
  24 + <td><h5>Metric Code</h5></td>
  25 + </tr>
  26 + <% @configuration.metric_configurations.each do |metric_configuration| %>
34 27 <tr class="metric">
35 28 <td><%= metric_configuration.metric.name %></td>
36 29 <td><%= metric_configuration.metric.origin %></td>
37 30 <td><%= metric_configuration.code %></td>
38 31 <td><%= link_to "Edit", :controller => "mezuro_plugin_profile", :action => "edit_metric_configuration", :params =>
39   - {:configuration_name => @configuration.name, :metric_code => metric_configuration.code} %></td>
  32 + {:configuration_name => @configuration.name, :metric_name => metric_configuration.metric.name} %></td>
40 33 </tr>
41 34 <% end %>
42 35 </table>
... ...
plugins/mezuro/views/mezuro_plugin_profile/new_metric_configuration.html.erb
  Diff comments   View file @87eafae
... ... @@ -3,7 +3,11 @@
3 3 <% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_profile"}, :method => :get do |f| %>
4 4 <%= hidden_field_tag :configuration_name, @configuration_name %>
5 5 <%= hidden_field_tag :scope, @metric.scope %>
6   - <%= hidden_field_tag :language, @metric.language %>
  6 +
  7 + <% @metric.language.each do |language| %>
  8 + <%= hidden_field_tag "language[]", language %>
  9 + <% end %>
  10 +
7 11  
8 12 <p>
9 13 <%= f.label :origin, "Collector Name:" %>
... ...