From 04c3f27d13f6503529ef5861708a44a0c97e4445 Mon Sep 17 00:00:00 2001 From: Diego Araújo Date: Fri, 22 May 2015 14:13:32 -0300 Subject: [PATCH] Regular users sould not be able to make a configuration or a reading group private. --- app/controllers/kalibro_configurations_controller.rb | 17 +++-------------- app/controllers/reading_groups_controller.rb | 12 ++---------- app/views/kalibro_configurations/_form.html.erb | 8 -------- app/views/reading_groups/_form.html.erb | 7 ------- config/locales/views/shared/en.yml | 1 - config/locales/views/shared/pt.yml | 1 - spec/controllers/kalibro_configurations_controller_spec.rb | 1 - spec/controllers/reading_groups_controller_spec.rb | 1 - 8 files changed, 5 insertions(+), 43 deletions(-) diff --git a/app/controllers/kalibro_configurations_controller.rb b/app/controllers/kalibro_configurations_controller.rb index b45dfa7..e3fbdfd 100644 --- a/app/controllers/kalibro_configurations_controller.rb +++ b/app/controllers/kalibro_configurations_controller.rb @@ -3,6 +3,7 @@ include OwnershipAuthentication class KalibroConfigurationsController < ApplicationController before_action :authenticate_user!, except: [:index, :show] before_action :kalibro_configuration_owner?, only: [:edit, :update, :destroy] + before_action :set_kalibro_configuration, only: [:show, :edit, :update, :destroy] # GET /kalibro_configurations/new def new @@ -27,7 +28,6 @@ class KalibroConfigurationsController < ApplicationController # GET /kalibro_configurations/1 # GET /kalibro_configurations/1.json def show - set_kalibro_configuration Rails.cache.fetch("#{@kalibro_configuration.id}_metric_configurations") do @kalibro_configuration.metric_configurations end @@ -35,15 +35,10 @@ class KalibroConfigurationsController < ApplicationController # GET /kalibro_configurations/1/edit # GET /kalibro_configurations/1/edit.json - def edit - set_kalibro_configuration - @attributes = @kalibro_configuration.attributes - end + def edit; end def update - set_kalibro_configuration if @kalibro_configuration.update(kalibro_configuration_params) - @kalibro_configuration.attributes.update(public: attributes_params) redirect_to(kalibro_configuration_path(@kalibro_configuration.id)) else render "edit" @@ -53,8 +48,6 @@ class KalibroConfigurationsController < ApplicationController # DELETE /kalibro_configurations/1 # DELETE /kalibro_configurations/1.json def destroy - set_kalibro_configuration - @kalibro_configuration.destroy respond_to do |format| @@ -77,14 +70,10 @@ class KalibroConfigurationsController < ApplicationController params[:kalibro_configuration] end - def attributes_params - params[:attributes][:public] == "1" - end - # Extracted code from create action def create_and_redir(format) if @kalibro_configuration.save - current_user.kalibro_configuration_attributes.create(kalibro_configuration_id: @kalibro_configuration.id, public: attributes_params) + current_user.kalibro_configuration_attributes.create(kalibro_configuration_id: @kalibro_configuration.id) format.html { redirect_to kalibro_configuration_path(@kalibro_configuration.id), notice: t('successfully_created', :record => @kalibro_configuration.model_name.human) } format.json { render action: 'show', status: :created, location: @kalibro_configuration } diff --git a/app/controllers/reading_groups_controller.rb b/app/controllers/reading_groups_controller.rb index ecc7252..231d829 100644 --- a/app/controllers/reading_groups_controller.rb +++ b/app/controllers/reading_groups_controller.rb @@ -8,7 +8,6 @@ class ReadingGroupsController < ApplicationController # GET /reading_groups/new def new @reading_group = ReadingGroup.new - @attributes = @reading_group.attributes end # GET /reading_groups @@ -32,13 +31,10 @@ class ReadingGroupsController < ApplicationController # GET /reading_groups/1/edit # GET /reading_groups/1/edit.json - def edit - @attributes = @reading_group.attributes - end + def edit; end def update if @reading_group.update(reading_group_params) - @reading_group.attributes.update(public: attributes_params) redirect_to(reading_group_path(@reading_group.id)) else render "edit" @@ -67,15 +63,11 @@ class ReadingGroupsController < ApplicationController params[:reading_group][:name].strip! params[:reading_group] end - - def attributes_params - params[:attributes][:public] == "1" - end # Extracted code from create action def create_and_redir(format) if @reading_group.save - current_user.reading_group_attributes.create(reading_group_id: @reading_group.id, public: attributes_params) + current_user.reading_group_attributes.create(reading_group_id: @reading_group.id) format.html { redirect_to reading_group_path(@reading_group.id), notice: t('successfully_created', :record => t(@reading_group.class)) } format.json { render action: 'show', status: :created, location: @reading_group } diff --git a/app/views/kalibro_configurations/_form.html.erb b/app/views/kalibro_configurations/_form.html.erb index 0571b58..86772d7 100644 --- a/app/views/kalibro_configurations/_form.html.erb +++ b/app/views/kalibro_configurations/_form.html.erb @@ -17,14 +17,6 @@ <%= f.text_area :description, class: 'text-area form-control' %> - -
-
- -
-
diff --git a/app/views/reading_groups/_form.html.erb b/app/views/reading_groups/_form.html.erb index e14b115..13e7a5c 100644 --- a/app/views/reading_groups/_form.html.erb +++ b/app/views/reading_groups/_form.html.erb @@ -16,13 +16,6 @@ <%= f.text_area :description, class: 'text-area form-control' %> -
-
- -
-
diff --git a/config/locales/views/shared/en.yml b/config/locales/views/shared/en.yml index 6fe1500..6868026 100644 --- a/config/locales/views/shared/en.yml +++ b/config/locales/views/shared/en.yml @@ -1,4 +1,3 @@ en: about_mezuro: "About Mezuro" about_mezuro_body_html: "The Mezuro project attempts to provide a platform to compare projects and metric techniques, teaching how to use metrics through configurations and code analysis, avoid technical debts and disseminate code metrics usage and understanding.
Here you can try the front-end, which we call Prezento. It interacts with the %{href} and %{href2}. It is intended to be a service where you can evaluate your code quality and, if you want, define which set of metrics to use." - should_be_public: "Visible to everyone" diff --git a/config/locales/views/shared/pt.yml b/config/locales/views/shared/pt.yml index ccf6bd1..76961fa 100644 --- a/config/locales/views/shared/pt.yml +++ b/config/locales/views/shared/pt.yml @@ -1,4 +1,3 @@ pt: about_mezuro: "Sobre Mezuro" about_mezuro_body_html: "O projeto Mezuro tenta prover uma plataforma para comparar técnicas de projetos e métricas, ensinando como usar métricas através de configurações e análise de código, evitando débitos técnicos e disseminando o uso e entendimento de métricas de código.
Aqui você pode experimentar a interface, que nós chamamos de Prezento. Ela interage com o %{href} e o %{href2}. A ideia é ser um serviço em que vocẽ pode avaliar a qualidade do seu código e, se você quiser, definir um conjunto de métricas a serem usadas." - should_be_public: "Visível para todos" diff --git a/spec/controllers/kalibro_configurations_controller_spec.rb b/spec/controllers/kalibro_configurations_controller_spec.rb index 5e151a3..c961feb 100644 --- a/spec/controllers/kalibro_configurations_controller_spec.rb +++ b/spec/controllers/kalibro_configurations_controller_spec.rb @@ -216,7 +216,6 @@ describe KalibroConfigurationsController, :type => :controller do before :each do KalibroConfiguration.expects(:find).with(kalibro_configuration.id).returns(kalibro_configuration) KalibroConfiguration.any_instance.expects(:update).with(kalibro_configuration_params).returns(true) - kalibro_configuration.expects(:attributes).returns(kalibro_configuration_attribute) end context 'rendering the show' do diff --git a/spec/controllers/reading_groups_controller_spec.rb b/spec/controllers/reading_groups_controller_spec.rb index de42927..552fce3 100644 --- a/spec/controllers/reading_groups_controller_spec.rb +++ b/spec/controllers/reading_groups_controller_spec.rb @@ -209,7 +209,6 @@ describe ReadingGroupsController, :type => :controller do context 'with valid fields' do before :each do - @subject.expects(:attributes).returns(@ownership) ReadingGroup.expects(:find).with(@subject.id).returns(@subject) ReadingGroup.any_instance.expects(:update).with(@subject_params).returns(true) end -- libgit2 0.21.2