Commit cde544083dd7fdb3b6f1479c12c7b8dda3648215
Committed by
Paulo Meireles
Paulo Meireles
1 parent
98230c89
Exists in
master
and in
29 other branches
[Mezuro] renamed mezuro plugin license to project_license to avoid
conflict with noosfero article license
Showing
3 changed files
with
4 additions
and
4 deletions
Show diff stats
plugins/mezuro/lib/mezuro_plugin/project_content.rb
| 1 | 1 | class MezuroPlugin::ProjectContent < Article |
| 2 | 2 | include ActionView::Helpers::TagHelper |
| 3 | 3 | |
| 4 | - settings_items :license, :description, :repository_type, :repository_url, :configuration_name, :periodicity_in_days | |
| 4 | + settings_items :project_license, :description, :repository_type, :repository_url, :configuration_name, :periodicity_in_days | |
| 5 | 5 | |
| 6 | 6 | validate_on_create :validate_kalibro_project_name |
| 7 | 7 | validate_on_create :validate_repository_url |
| ... | ... | @@ -95,7 +95,7 @@ Kalibro::ProjectResult.first_result_after(name, date) |
| 95 | 95 | def create_kalibro_project |
| 96 | 96 | Kalibro::Project.create( |
| 97 | 97 | :name => name, |
| 98 | - :license => license, | |
| 98 | + :license => project_license, | |
| 99 | 99 | :description => description, |
| 100 | 100 | :repository => { |
| 101 | 101 | :type => repository_type, | ... | ... |
plugins/mezuro/test/fixtures/project_fixtures.rb
| ... | ... | @@ -28,7 +28,7 @@ class ProjectFixtures |
| 28 | 28 | def self.project_content |
| 29 | 29 | content = MezuroPlugin::ProjectContent.new |
| 30 | 30 | content.name = 'Qt-Calculator' |
| 31 | - content.license = 'GPL' | |
| 31 | + content.project_license = 'GPL' | |
| 32 | 32 | content.description = 'Calculator for Qt' |
| 33 | 33 | content.repository_type = RepositoryFixtures.repository_hash[:type] |
| 34 | 34 | content.repository_url = RepositoryFixtures.repository_hash[:address] | ... | ... |
plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb