Download as
Browse Code »

Commit 9f31b259f9b222b1c871e88514927ef03177850b

Authored by Alessandro Palmeira
Committed by João da Silva
1 parent ed0172e0
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] Refactoring metric configuration forms

Showing 2 changed files with 23 additions and 24 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
  Diff comments   View file @9f31b25
... ... @@ -162,7 +162,7 @@ class MezuroPluginMyprofileController < ProfileController
162 162 metric_configuration
163 163 end
164 164  
165   - def assign_compound_metric_configuration_instance (metric_configuration)
  165 + def assign_compound_metric_configuration_instance (metric_configuration)
166 166 metric_configuration.metric.name = params[:metric_configuration][:metric][:name]
167 167 metric_configuration.metric.description = params[:metric_configuration][:metric][:description]
168 168 metric_configuration.metric.scope = params[:metric_configuration][:metric][:scope]
... ...
plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric.html.erb
  Diff comments   View file @9f31b25
... ... @@ -2,26 +2,31 @@
2 2  
3 3 <% form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration",
4 4 :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
5   - <%= hidden_field_tag :configuration_name, @configuration_name %>
6   -
7   - <p>
8   - <%= f.label :metric_name, "Metric Name:" %>
9   - <%= f.text_field :metric_name %>
10   - </p>
11   - <p>
12   - <%= f.label :description, "Description:" %>
13   - <%= f.text_field :description %>
14   - </p>
15   - <p>
16   - <%= f.label :scope, "Scope:" %>
17   - <%= f.select :scope, [["Class", "CLASS"]] %>
18   - </p>
  5 + <%= hidden_field_tag :configuration_name, @configuration_name %>
  6 + <% f.fields_for :metric do |m| %>
  7 + <p>
  8 + <%= m.label :name, "Name:" %>
  9 + <%= m.text_field "name" %>
  10 + </p>
  11 + <p>
  12 + <%= m.label :description, "Description:" %>
  13 + <%= m.text_field "description" %>
  14 + </p>
  15 + <p>
  16 + <%= m.label :scope, "Scope:" %>
  17 + <%= m.select :scope, [["Class", "CLASS"]] %>
  18 + </p>
  19 + <p>
  20 + <%= m.label :script, "Script:" %>
  21 + <%= m.text_area "script" %>
  22 + </p>
  23 + <% end %>
19 24 <p>
20 25 <%= f.label :code, "Code:" %>
21   - <%= f.text_field :code %>
  26 + <%= f.text_field "code" %>
22 27 </p>
23 28 <p>
24   - <%= f.label :aggregation_form, "Aggregation:" %>
  29 + <%= f.label :aggregation_form, "Aggregation Form:" %>
25 30 <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"],
26 31 ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
27 32 </p>
... ... @@ -30,14 +35,8 @@
30 35 <%= f.text_field :weight %>
31 36 </p>
32 37 <p>
33   - <%= f.label :script, "Script:" %>
34   - <%= f.text_area :script %>
35   - </p>
36   -
37   - <p>
38   - <%= f.submit "Add" %>
  38 + <%= f.submit "Save" %>
39 39 </p>
40   -
41 40 <% end %>
42 41  
43 42 <!-- make this prettier -->
... ...