From 38d8bf14101b6b63bcac121580162047bfa57007 Mon Sep 17 00:00:00 2001 From: João M. M. da Silva + Diego Araújo Date: Wed, 30 Jan 2013 15:08:19 -0200 Subject: [PATCH] [Mezuro] Refactored duplicated code in controllers. --- plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb | 78 +++++++++++++++++++++++++++++++++--------------------------------------------- plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb | 49 ++++++++++++++++++++++++++----------------------- plugins/mezuro/controllers/myprofile/mezuro_plugin_reading_controller.rb | 19 ++++--------------- plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb | 55 +++++++++++++++++++------------------------------------ plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb | 20 +++++++------------- plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb | 2 +- plugins/mezuro/test/functional/myprofile/mezuro_plugin_reading_controller_test.rb | 22 +++------------------- plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb | 26 ++++---------------------- plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb | 2 +- plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb | 2 +- plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb | 2 +- plugins/mezuro/views/mezuro_plugin_reading/new.html.erb | 2 +- plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb | 2 +- plugins/mezuro/views/mezuro_plugin_repository/new.html.erb | 2 +- 14 files changed, 103 insertions(+), 180 deletions(-) diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb index a3ec40a..0c51822 100644 --- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb +++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb @@ -14,26 +14,34 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle @reading_group_names_and_ids = reading_group_names_and_ids end - def create_native + def edit_native + params_to_edit_view + end + + def new_compound + @configuration_content = profile.articles.find(params[:id]) + @metric_configurations = @configuration_content.metric_configurations + @reading_group_names_and_ids = reading_group_names_and_ids + if configuration_content_has_errors? + redirect_to_error_page @configuration_content.errors[:base] + end + end + + def edit_compound + params_to_edit_view + end + + def create configuration_content = profile.articles.find(params[:id]) metric_configuration = Kalibro::MetricConfiguration.create(params[:metric_configuration]) if metric_configuration_has_errors? metric_configuration redirect_to_error_page metric_configuration.errors[0].message else - redirect_to(metric_configuration_url(configuration_content)) + redirect_to(metric_configuration_url(configuration_content)) end end - def edit_native - @configuration_content = profile.articles.find(params[:id]) - metric_configurations = @configuration_content.metric_configurations - @metric_configuration = find_metric_configuration(metric_configurations, params[:metric_configuration_id].to_i) - @metric = @metric_configuration.metric - @reading_group_names_and_ids = reading_group_names_and_ids - @ranges = Kalibro::Range.ranges_of(@metric_configuration.id) - end - def update @configuration_content = profile.articles.find(params[:id]) metric_configurations = @configuration_content.metric_configurations @@ -57,51 +65,22 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle redirect_to configuration_content.view_url end end - - def new_compound - @configuration_content = profile.articles.find(params[:id]) - @metric_configurations = @configuration_content.metric_configurations - @reading_group_names_and_ids = reading_group_names_and_ids - if configuration_content_has_errors? - redirect_to_error_page @configuration_content.errors[:base] - end - end - - def create_compound - configuration_content = profile.articles.find(params[:id]) - metric_configuration = Kalibro::MetricConfiguration.create(params[:metric_configuration]) - - if metric_configuration_has_errors? metric_configuration - redirect_to_error_page metric_configuration.errors[0].message - else - redirect_to(metric_configuration_url(configuration_content)) - end - end - - def edit_compound - @configuration_content = profile.articles.find(params[:id]) - @metric_configurations = @configuration_content.metric_configurations - @metric_configuration = find_metric_configuration(@metric_configurations, params[:metric_configuration_id].to_i) - @metric = @metric_configuration.metric - @reading_group_names_and_ids = reading_group_names_and_ids - @ranges = Kalibro::Range.ranges_of(@metric_configuration.id) - end private - + def find_metric_configuration (metric_configurations, metric_configuration_id) metric_configurations.select {|metric_configuration| metric_configuration.id == metric_configuration_id }.first end - + def reading_group_names_and_ids array = Kalibro::ReadingGroup.all.map { |reading_group| [reading_group.name, reading_group.id] } array.sort { |x,y| x.first.downcase <=> y.first.downcase } end - + def metric_configuration_has_errors? metric_configuration not metric_configuration.errors.empty? end - + def configuration_content_has_errors? not @configuration_content.errors[:base].nil? end @@ -114,5 +93,14 @@ class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileControlle url[:action] = (params[:metric_configuration][:metric][:compound] ? "edit_compound" : "edit_native") url end -end + def params_to_edit_view + @configuration_content = profile.articles.find(params[:id]) + @metric_configurations = @configuration_content.metric_configurations + @metric_configuration = find_metric_configuration(@metric_configurations, params[:metric_configuration_id].to_i) + @metric = @metric_configuration.metric + @reading_group_names_and_ids = reading_group_names_and_ids + @ranges = Kalibro::Range.ranges_of(@metric_configuration.id) + end + +end diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb index 7c6d9eb..7f73588 100644 --- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb +++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_range_controller.rb @@ -3,44 +3,27 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController append_view_path File.join(File.dirname(__FILE__) + '/../../views') def new - @content_id = params[:id].to_i - @metric_configuration_id = params[:metric_configuration_id].to_i - @reading_labels_and_ids = reading_labels_and_ids - @reading_group_id = params[:reading_group_id].to_i - @compound = params[:compound] + params_to_range_form + params_to_redirect end def edit - @content_id = params[:id].to_i - @metric_configuration_id = params[:metric_configuration_id].to_i + params_to_range_form ranges = Kalibro::Range.ranges_of params[:metric_configuration_id].to_i @range = (ranges.select { |range| range.id == params[:range_id].to_i }).first - @reading_labels_and_ids = reading_labels_and_ids end def create - metric_configuration_id = params[:metric_configuration_id].to_i - @reading_group_id = params[:reading_group_id].to_i - @compound = params[:compound] - @range = Kalibro::Range.new params[:range] - @range.save metric_configuration_id - if !@range.errors.empty? - @error = @range.errors[0].message - end + params_to_redirect + save_range end def update - metric_configuration_id = params[:metric_configuration_id].to_i - @range = Kalibro::Range.new params[:range] - @range.save metric_configuration_id - if !@range.errors.empty? - @error = @range.errors[0].message - end + save_range end def remove configuration_content = profile.articles.find(params[:id]) - Kalibro::Range.new({:id => params[:range_id].to_i}).destroy redirect_to(metric_configuration_url(configuration_content)) end @@ -61,4 +44,24 @@ class MezuroPluginRangeController < MezuroPluginMyprofileController array.sort { |x,y| x.first.downcase <=> y.first.downcase } end + def save_range + metric_configuration_id = params[:metric_configuration_id].to_i + @range = Kalibro::Range.new params[:range] + @range.save metric_configuration_id + if !@range.errors.empty? + @error = @range.errors[0].message + end + end + + def params_to_range_form + @content_id = params[:id].to_i + @metric_configuration_id = params[:metric_configuration_id].to_i + @reading_labels_and_ids = reading_labels_and_ids + end + + def params_to_redirect + @reading_group_id = params[:reading_group_id].to_i + @compound = params[:compound] + end + end diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_reading_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_reading_controller.rb index ac77d00..bb3b39d 100644 --- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_reading_controller.rb +++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_reading_controller.rb @@ -1,12 +1,12 @@ class MezuroPluginReadingController < MezuroPluginMyprofileController append_view_path File.join(File.dirname(__FILE__) + '/../../views') - + def new @reading_group_content = profile.articles.find(params[:id]) end - - def create + + def save reading_group_content = profile.articles.find(params[:id]) reading = Kalibro::Reading.new params[:reading] @@ -22,17 +22,6 @@ class MezuroPluginReadingController < MezuroPluginMyprofileController @reading = Kalibro::Reading.find params[:reading_id] end - def update - reading_group_content = profile.articles.find(params[:id]) - reading = Kalibro::Reading.new params[:reading] - - if( reading.save(reading_group_content.reading_group_id) ) - redirect_to reading_group_content.view_url - else - redirect_to_error_page reading.errors[0].message - end - end - def destroy reading_group_content = profile.articles.find(params[:id]) reading = Kalibro::Reading.find params[:reading_id] @@ -43,5 +32,5 @@ class MezuroPluginReadingController < MezuroPluginMyprofileController redirect_to_error_page reading.errors[0].message end end - + end diff --git a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb index 2f5cf5f..2e64c9c 100644 --- a/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb +++ b/plugins/mezuro/controllers/profile/mezuro_plugin_repository_controller.rb @@ -1,49 +1,19 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController append_view_path File.join(File.dirname(__FILE__) + '/../../views') - - def new - @project_content = profile.articles.find(params[:id]) - - @repository_types = Kalibro::Repository.repository_types - - configurations = Kalibro::Configuration.all - configurations = [] if (configurations.nil?) - @configuration_select = configurations.map do |configuration| - [configuration.name,configuration.id] - end - end - - def create - project_content = profile.articles.find(params[:id]) - repository = Kalibro::Repository.new( params[:repository] ) - repository.save(project_content.project_id) - - if( repository.errors.empty? ) - repository.process - redirect_to(repository_url(project_content)) - else - redirect_to_error_page repository.errors[0].message - end + def new + params_repository_form end def edit - @project_content = profile.articles.find(params[:id]) - @repository_types = Kalibro::Repository.repository_types - - configurations = Kalibro::Configuration.all - configurations = [] if (configurations.nil?) - @configuration_select = configurations.map do |configuration| - [configuration.name,configuration.id] - end - + params_repository_form @repository = @project_content.repositories.select{ |repository| repository.id.to_s == params[:repository_id] }.first end - def update + def save project_content = profile.articles.find(params[:id]) - + repository = Kalibro::Repository.new( params[:repository] ) repository.save(project_content.project_id) @@ -71,6 +41,8 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController redirect_to_error_page repository.errors[0].message end end + + private def repository_url project_content url = project_content.view_url @@ -80,5 +52,16 @@ class MezuroPluginRepositoryController < MezuroPluginProfileController url[:action] = "show" url end - + + def params_repository_form + @project_content = profile.articles.find(params[:id]) + @repository_types = Kalibro::Repository.repository_types + + configurations = Kalibro::Configuration.all + configurations = [] if (configurations.nil?) + @configuration_select = configurations.map do |configuration| + [configuration.name,configuration.id] + end + end + end diff --git a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb index b7dc3a7..c9d00b5 100644 --- a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb +++ b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb @@ -14,7 +14,7 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase @controller = MezuroPluginMetricConfigurationController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new - @profile = fast_create(Community) #FIXME Should be a person, not a community + @profile = fast_create(Profile) @configuration = ConfigurationFixtures.configuration @created_configuration = ConfigurationFixtures.created_configuration @@ -61,12 +61,6 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase assert_response :success end - should 'create native' do - Kalibro::MetricConfiguration.expects(:create).returns(@native_metric_configuration) #FIXME need .with(some_hash), should it mock the request?. - get :create_native, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration => @native_metric_configuration_hash - assert_response :redirect - end - should 'edit native' do Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration.id).returns([@native_metric_configuration]) Kalibro::ReadingGroup.expects(:all).returns([@reading_group]) @@ -91,12 +85,6 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase assert_response :success end - should 'create compound' do - Kalibro::MetricConfiguration.expects(:create).returns(@compound_metric_configuration) #FIXME need .with(some_hash), should it mock the request?. - get :create_compound, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration => @compound_metric_configuration_hash - assert_response :redirect - end - should 'edit compound' do Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration.id).returns([@compound_metric_configuration]) Kalibro::ReadingGroup.expects(:all).returns([@reading_group]) @@ -112,6 +100,12 @@ class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase assert_response :success end + should 'create' do + Kalibro::MetricConfiguration.expects(:create).returns(@compound_metric_configuration) #FIXME need .with(some_hash), should it mock the request?. + get :create, :profile => @profile.identifier, :id => @configuration_content.id, :metric_configuration => @compound_metric_configuration_hash + assert_response :redirect + end + should 'update' do Kalibro::MetricConfiguration.expects(:metric_configurations_of).with(@configuration_content.configuration_id).returns([@native_metric_configuration]) @native_metric_configuration.expects(:update_attributes).returns(true) #FIXME need .with(some_hash), should it mock the request?. diff --git a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb index ba68a7e..2a3685b 100644 --- a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb +++ b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_range_controller_test.rb @@ -12,7 +12,7 @@ class MezuroPluginRangeControllerTest < ActionController::TestCase @controller = MezuroPluginRangeController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new - @profile = fast_create(Community) + @profile = fast_create(Profile) @metric_configuration = MetricConfigurationFixtures.amloc_metric_configuration @metric_configuration_hash = MetricConfigurationFixtures.amloc_metric_configuration_hash diff --git a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_reading_controller_test.rb b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_reading_controller_test.rb index 280d862..55b342e 100644 --- a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_reading_controller_test.rb +++ b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_reading_controller_test.rb @@ -9,7 +9,7 @@ class MezuroPluginReadingControllerTest < ActionController::TestCase @controller = MezuroPluginReadingController.new @request = ActionController::TestRequest.new @response = ActionController::TestResponse.new - @profile = fast_create(Community) + @profile = fast_create(Profile) @reading = ReadingFixtures.reading @created_reading = ReadingFixtures.created_reading @@ -29,7 +29,7 @@ class MezuroPluginReadingControllerTest < ActionController::TestCase should 'create a reading' do Kalibro::Reading.expects(:new).with(@reading_hash.to_s).returns(@created_reading) @created_reading.expects(:save).with(@content.reading_group_id).returns(true) - get :create, :profile => @profile.identifier, :id => @content.id, :reading => @reading_hash + get :save, :profile => @profile.identifier, :id => @content.id, :reading => @reading_hash assert @created_reading.errors.empty? assert_response :redirect end @@ -38,7 +38,7 @@ class MezuroPluginReadingControllerTest < ActionController::TestCase @created_reading.errors = [Exception.new] Kalibro::Reading.expects(:new).with(@reading_hash.to_s).returns(@created_reading) @created_reading.expects(:save).with(@content.reading_group_id).returns(false) - get :create, :profile => @profile.identifier, :id => @content.id, :reading => @reading_hash + get :save, :profile => @profile.identifier, :id => @content.id, :reading => @reading_hash assert !@created_reading.errors.empty? assert_response :redirect end @@ -51,22 +51,6 @@ class MezuroPluginReadingControllerTest < ActionController::TestCase assert_response :success end - should 'update a reading' do - Kalibro::Reading.expects(:new).with(@reading_hash.to_s).returns(@reading) - @reading.expects(:save).with(@content.reading_group_id).returns(true) - get :update, :profile => @profile.identifier, :id => @content.id, :reading => @reading_hash - assert @reading.errors.empty? - assert_response :redirect - end - - should 'put an Exception in reading when an error occurs in update action' do - @reading.errors = [Exception.new] - Kalibro::Reading.expects(:new).with(@reading_hash.to_s).returns(@reading) - @reading.expects(:save).with(@content.reading_group_id).returns(false) - get :update, :profile => @profile.identifier, :id => @content.id, :reading => @reading_hash - assert_response :redirect - end - should 'destroy a reading' do @reading.expects(:destroy) Kalibro::Reading.expects(:find).with(@reading.id.to_s).returns(@reading) diff --git a/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb b/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb index 8e26a93..1da7422 100644 --- a/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb +++ b/plugins/mezuro/test/functional/profile/mezuro_plugin_repository_controller_test.rb @@ -38,20 +38,20 @@ class MezuroPluginRepositoryControllerTest < ActionController::TestCase assert_response :success end - should 'create a repository' do + should 'save a repository' do Kalibro::Repository.expects(:new).returns(@repository) @repository.expects(:save).with(@content.project_id).returns(true) @repository.expects(:process) - get :create, :profile => @profile.identifier, :id => @content.id, :repository => @repository_hash + get :save, :profile => @profile.identifier, :id => @content.id, :repository => @repository_hash assert @repository.errors.empty? assert_response :redirect end - should 'not create a repository' do + should 'not save a repository' do @repository.errors = [Exception.new] Kalibro::Repository.expects(:new).returns(@repository) @repository.expects(:save).with(@content.project_id).returns(false) - get :create, :profile => @profile.identifier, :id => @content.id, :repository => @repository_hash + get :save, :profile => @profile.identifier, :id => @content.id, :repository => @repository_hash assert !@repository.errors.empty? assert_response :redirect end @@ -71,24 +71,6 @@ class MezuroPluginRepositoryControllerTest < ActionController::TestCase assert_response :success end - should 'update a repository' do - Kalibro::Repository.expects(:new).returns(@repository) - @repository.expects(:save).with(@content.project_id).returns(true) - Kalibro::Repository.expects(:request).with(:process_repository, {:repository_id => @repository.id}) - get :update, :profile => @profile.identifier, :id => @content.id, :repository => @repository_hash - assert @repository.errors.empty? - assert_response :redirect - end - - should 'not update a repository' do - @repository.errors = [Exception.new] - Kalibro::Repository.expects(:new).returns(@repository) - @repository.expects(:save).with(@content.project_id).returns(false) - get :update, :profile => @profile.identifier, :id => @content.id, :repository => @repository_hash - assert !@repository.errors.empty? - assert_response :redirect - end - should 'set variables to show a repository' do Kalibro::Repository.expects(:repositories_of).with(@content.project_id).returns([@repository]) Kalibro::Configuration.expects(:configuration_of).with(@repository.id).returns(@configuration) diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb index fd4b5fa..ab5e89c 100644 --- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound.html.erb @@ -1,6 +1,6 @@

<%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %>

-<% form_for :metric_configuration, :url => {:action =>"create_compound", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %> +<% form_for :metric_configuration, :url => {:action =>"create", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %> <%= hidden_field_tag :id, @configuration_content.id %> <%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %> diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb index 0943197..f3396d0 100644 --- a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_native.html.erb @@ -2,7 +2,7 @@

<%= link_to("#{@configuration_content.name} Configuration", @configuration_content.view_url) %>

-<% form_for :metric_configuration, :url => {:action =>"create_native", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %> +<% form_for :metric_configuration, :url => {:action =>"create", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %> <%= hidden_field_tag :id, @configuration_content.id %> <%= f.hidden_field :configuration_id, :value => @configuration_content.configuration_id %> diff --git a/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb b/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb index 71ad4fb..11e23b3 100644 --- a/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_reading/edit.html.erb @@ -2,7 +2,7 @@

<%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %>

-<% form_for :reading, :url => {:action =>"update", :controller => "mezuro_plugin_reading"}, :method => :get do |f| %> +<% form_for :reading, :url => {:action =>"save", :controller => "mezuro_plugin_reading"}, :method => :get do |f| %> <%= hidden_field_tag :id, @reading_group_content.id %> <%= f.hidden_field :id %> diff --git a/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb b/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb index 5aaa73a..9033052 100644 --- a/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_reading/new.html.erb @@ -2,7 +2,7 @@

<%= link_to("#{@reading_group_content.name} Reading Group", @reading_group_content.view_url) %>

-<% form_for :reading, :url => {:action =>"create", :controller => "mezuro_plugin_reading"}, :method => :get do |f| %> +<% form_for :reading, :url => {:action =>"save", :controller => "mezuro_plugin_reading"}, :method => :get do |f| %> <%= hidden_field_tag :id, @reading_group_content.id %> <%= required labelled_form_field _('label:'), f.text_field(:label) %> diff --git a/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb index e3c2e1f..45c808b 100644 --- a/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb @@ -1,6 +1,6 @@

<%= link_to("#{@project_content.name} Project", @project_content.view_url) %>

-<% form_for :repository, :url => {:action =>"update", :controller => "mezuro_plugin_repository"}, :method => :get do |f| %> +<% form_for :repository, :url => {:action =>"save", :controller => "mezuro_plugin_repository"}, :method => :get do |f| %> <%= hidden_field_tag :id, @project_content.id %> <%= f.hidden_field :id%> diff --git a/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb b/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb index df9f65b..b082210 100644 --- a/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb +++ b/plugins/mezuro/views/mezuro_plugin_repository/new.html.erb @@ -1,6 +1,6 @@

<%= link_to("#{@project_content.name} Project", @project_content.view_url) %>

-<% form_for :repository, :url => {:action =>"create", :controller => "mezuro_plugin_repository"}, :method => :get do |f| %> +<% form_for :repository, :url => {:action =>"save", :controller => "mezuro_plugin_repository"}, :method => :get do |f| %> <%= hidden_field_tag :id, @project_content.id %> <%= required labelled_form_field _('Name:'), f.text_field(:name) %> -- libgit2 0.21.2