From cde544083dd7fdb3b6f1479c12c7b8dda3648215 Mon Sep 17 00:00:00 2001 From: Paulo Meirelles + João M. M. da Silva Date: Thu, 16 Aug 2012 17:27:35 -0300 Subject: [PATCH] [Mezuro] renamed mezuro plugin license to project_license to avoid conflict with noosfero article license --- plugins/mezuro/lib/mezuro_plugin/project_content.rb | 4 ++-- plugins/mezuro/test/fixtures/project_fixtures.rb | 2 +- plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/mezuro/lib/mezuro_plugin/project_content.rb b/plugins/mezuro/lib/mezuro_plugin/project_content.rb index 78919fb..e944728 100644 --- a/plugins/mezuro/lib/mezuro_plugin/project_content.rb +++ b/plugins/mezuro/lib/mezuro_plugin/project_content.rb @@ -1,7 +1,7 @@ class MezuroPlugin::ProjectContent < Article include ActionView::Helpers::TagHelper - settings_items :license, :description, :repository_type, :repository_url, :configuration_name, :periodicity_in_days + settings_items :project_license, :description, :repository_type, :repository_url, :configuration_name, :periodicity_in_days validate_on_create :validate_kalibro_project_name validate_on_create :validate_repository_url @@ -95,7 +95,7 @@ Kalibro::ProjectResult.first_result_after(name, date) def create_kalibro_project Kalibro::Project.create( :name => name, - :license => license, + :license => project_license, :description => description, :repository => { :type => repository_type, diff --git a/plugins/mezuro/test/fixtures/project_fixtures.rb b/plugins/mezuro/test/fixtures/project_fixtures.rb index cde418e..4c18d24 100644 --- a/plugins/mezuro/test/fixtures/project_fixtures.rb +++ b/plugins/mezuro/test/fixtures/project_fixtures.rb @@ -28,7 +28,7 @@ class ProjectFixtures def self.project_content content = MezuroPlugin::ProjectContent.new content.name = 'Qt-Calculator' - content.license = 'GPL' + content.project_license = 'GPL' content.description = 'Calculator for Qt' content.repository_type = RepositoryFixtures.repository_hash[:type] content.repository_url = RepositoryFixtures.repository_hash[:address] diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb index bc66195..9a7ecda 100644 --- a/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb +++ b/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb @@ -20,7 +20,7 @@ <%= required f.text_field(:name) %> <% end %> -<%= f.text_field :license %>
+<%= f.text_field :project_license %>
<%= f.text_field :description %>
-- libgit2 0.21.2