From 5836a72a0204664079a4ac63795cc1edb883799d Mon Sep 17 00:00:00 2001 From: Heitor Reis Date: Mon, 18 May 2015 14:38:59 -0300 Subject: [PATCH] Added user option for visibility of reading group and configuration --- app/assets/stylesheets/form_with_tooltip.css | 3 +++ app/controllers/kalibro_configurations_controller.rb | 6 +++--- app/controllers/metric_configurations_controller.rb | 6 ++++++ app/controllers/reading_groups_controller.rb | 7 +++++-- app/controllers/repositories_controller.rb | 6 ++++++ app/views/kalibro_configurations/_form.html.erb | 7 +++++++ app/views/metric_configurations/_form.html.erb | 2 +- app/views/reading_groups/_form.html.erb | 8 +++++++- app/views/repositories/_form.html.erb | 3 +-- 9 files changed, 39 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/form_with_tooltip.css b/app/assets/stylesheets/form_with_tooltip.css index af32477..fe27c7b 100644 --- a/app/assets/stylesheets/form_with_tooltip.css +++ b/app/assets/stylesheets/form_with_tooltip.css @@ -18,6 +18,9 @@ float: left; width: 100%; padding: 20px; +.field-container.checkbox, .field-container.radio { + padding-top: 0; + padding-bottom: 0; } .help-container { diff --git a/app/controllers/kalibro_configurations_controller.rb b/app/controllers/kalibro_configurations_controller.rb index 8a7b8f7..e7f5b04 100644 --- a/app/controllers/kalibro_configurations_controller.rb +++ b/app/controllers/kalibro_configurations_controller.rb @@ -7,14 +7,13 @@ class KalibroConfigurationsController < ApplicationController # GET /kalibro_configurations/new def new @kalibro_configuration = KalibroConfiguration.new + @attributes = @kalibro_configuration.attributes end # GET /kalibro_configurations # GET /kalibro_configurations.json def index - @kalibro_configurations = KalibroConfigurationAttributes.where(public: true).map { |cfg_attr| - KalibroConfiguration.find(cfg_attr.kalibro_configuration_id) - }.compact + @kalibro_configurations = KalibroConfiguration.public_or_owned_by_user(current_user) end # POST /kalibro_configurations @@ -39,6 +38,7 @@ class KalibroConfigurationsController < ApplicationController # GET /kalibro_configurations/1/edit.json def edit set_kalibro_configuration + @attributes = @kalibro_configuration.attributes end diff --git a/app/controllers/metric_configurations_controller.rb b/app/controllers/metric_configurations_controller.rb index b61faf8..6b5e47b 100644 --- a/app/controllers/metric_configurations_controller.rb +++ b/app/controllers/metric_configurations_controller.rb @@ -9,6 +9,9 @@ class MetricConfigurationsController < BaseMetricConfigurationsController super # find_by_name throws an exception instead of returning nil, unlike ActiveRecord's API metric_configuration.metric = KalibroClient::Entities::Processor::MetricCollectorDetails.find_by_name(params[:metric_collector_name]).find_metric_by_code params[:metric_code] + @reading_groups = ReadingGroup.public_or_owned_by_user(current_user).map { |reading_group| + [reading_group.name, reading_group.id] + } end def create @@ -24,6 +27,9 @@ class MetricConfigurationsController < BaseMetricConfigurationsController #FIXME: set the configuration id just once! @kalibro_configuration_id = params[:kalibro_configuration_id] @metric_configuration.kalibro_configuration_id = @kalibro_configuration_id + @reading_groups = ReadingGroup.public_or_owned_by_user(current_user).map { |reading_group| + [reading_group.name, reading_group.id] + } end def update diff --git a/app/controllers/reading_groups_controller.rb b/app/controllers/reading_groups_controller.rb index 1dbb755..610de40 100644 --- a/app/controllers/reading_groups_controller.rb +++ b/app/controllers/reading_groups_controller.rb @@ -8,12 +8,13 @@ class ReadingGroupsController < ApplicationController # GET /reading_groups/new def new @reading_group = ReadingGroup.new + @attributes = @reading_group.attributes end # GET /reading_groups # GET /reading_groups.json def index - @reading_groups = ReadingGroup.public + @reading_groups = ReadingGroup.public_or_owned_by_user(current_user) end # POST /reading_groups @@ -31,7 +32,9 @@ class ReadingGroupsController < ApplicationController # GET /reading_groups/1/edit # GET /reading_groups/1/edit.json - def edit; end + def edit + @attributes = @reading_group.attributes + end def update if @reading_group.update(reading_group_params) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 9c6fc7b..acc42ad 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -19,12 +19,18 @@ class RepositoriesController < ApplicationController @project_id = params[:project_id] @repository = Repository.new @repository_types = Repository.repository_types + @configurations = KalibroConfiguration.public_or_owned_by_user(current_user).map { |conf| + [conf.name, conf.id] + } end # GET /repositories/1/edit def edit @project_id = params[:project_id] @repository_types = Repository.repository_types + @configurations = KalibroConfiguration.public_or_owned_by_user(current_user).map { |conf| + [conf.name, conf.id] + } end # POST /projects/1/repositories diff --git a/app/views/kalibro_configurations/_form.html.erb b/app/views/kalibro_configurations/_form.html.erb index 1101a0a..b74959e 100644 --- a/app/views/kalibro_configurations/_form.html.erb +++ b/app/views/kalibro_configurations/_form.html.erb @@ -18,6 +18,13 @@ +
+
+ +
+
diff --git a/app/views/metric_configurations/_form.html.erb b/app/views/metric_configurations/_form.html.erb index b7e0c60..46db6cc 100644 --- a/app/views/metric_configurations/_form.html.erb +++ b/app/views/metric_configurations/_form.html.erb @@ -34,7 +34,7 @@
<%= f.label :reading_group_id, class: 'control-label' %> - <%= f.select( :reading_group_id, reading_group_options, {class: 'form-control'} ) %> + <%= f.select( :reading_group_id, reading_groups, {class: 'form-control'} ) %>

diff --git a/app/views/reading_groups/_form.html.erb b/app/views/reading_groups/_form.html.erb index b914e9a..fe15063 100644 --- a/app/views/reading_groups/_form.html.erb +++ b/app/views/reading_groups/_form.html.erb @@ -3,7 +3,6 @@

-
<%= f.label :name, class: 'control-label' %> @@ -17,6 +16,13 @@ <%= f.text_area :description, class: 'text-area form-control' %>
+
+
+ +
+
diff --git a/app/views/repositories/_form.html.erb b/app/views/repositories/_form.html.erb index b9830d4..e0674f2 100644 --- a/app/views/repositories/_form.html.erb +++ b/app/views/repositories/_form.html.erb @@ -79,8 +79,7 @@
<%= f.label :kalibro_configuration_id, KalibroConfiguration.model_name.human, class: 'control-label' %> - <% configuration_list = KalibroClient::Entities::Configurations::KalibroConfiguration.all.map { |conf| [conf.name, conf.id] } %> - <%= f.select( :kalibro_configuration_id, configuration_list, class: 'tooltip-control' ) %> + <%= f.select( :kalibro_configuration_id, @configurations, class: 'tooltip-control' ) %>

-- libgit2 0.21.2