From 0473aedaa9f782095ca623c28eaf364d4f628f0c Mon Sep 17 00:00:00 2001 From: Alessandro Palmeira + Rafael Manzo Date: Tue, 27 Nov 2012 17:05:39 -0200 Subject: [PATCH] [Mezuro] Updated project_content and its views. --- plugins/mezuro/lib/mezuro_plugin/project_content.rb | 52 ++-------------------------------------------------- plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb | 31 ------------------------------- plugins/mezuro/views/content_viewer/show_project.rhtml | 37 ------------------------------------- 3 files changed, 2 insertions(+), 118 deletions(-) diff --git a/plugins/mezuro/lib/mezuro_plugin/project_content.rb b/plugins/mezuro/lib/mezuro_plugin/project_content.rb index 9bb43fd..8baf168 100644 --- a/plugins/mezuro/lib/mezuro_plugin/project_content.rb +++ b/plugins/mezuro/lib/mezuro_plugin/project_content.rb @@ -3,8 +3,6 @@ class MezuroPlugin::ProjectContent < Article settings_items :project_id - validate_on_create :validate_repository_address - def self.short_description 'Mezuro project' end @@ -38,50 +36,6 @@ class MezuroPlugin::ProjectContent < Article @repositories end - def processing(repository_id) - begin - if Kalibro::Processing.has_ready_processing(repository_id) - @processing ||= Kalibro::Processing.last_ready_processing_of(repository_id) - else - @processing = Kalibro::Processing.last_processing_of(repository_id) - end - rescue Exception => error - errors.add_to_base(error.message) - end - @processing - end - - def processing_with_date(repository_id, date) - begin - if Kalibro::Processing.has_processing_after(repository_id, date) - @processing ||= Kalibro::Processing.first_processing_after(repository_id, date) - elsif Kalibro::Processing.has_processing_before(repository_id, date) - @processing ||= Kalibro::Processing.last_processing_before(repository_id, date) - end - rescue Exception => error - errors.add_to_base(error.message) - end - @processing - end - - def module_result(repository_id, date = nil) - @processing ||= date.nil? ? processing(repository_id) : processing_with_date(repository_id, date) - begin - @module_result ||= Kalibro::ModuleResult.find(@processing.results_root_id) - rescue Exception => error - errors.add_to_base(error.message) - end - @module_result - end - - def result_history(module_result_id) - begin - @result_history ||= Kalibro::MetricResult.history_of(module_result_id) - rescue Exception => error - errors.add_to_base(error.message) - end - end - def description=(value) @description=value end @@ -95,7 +49,7 @@ class MezuroPlugin::ProjectContent < Article @repositories = @repositories.map { |element| to_repository(element) } end - after_save :send_project_to_service + before_save :send_project_to_service after_destroy :destroy_project_from_service private @@ -119,13 +73,11 @@ class MezuroPlugin::ProjectContent < Article def send_project_to_service created_project = create_kalibro_project - repositories = Kalibro::Repository.repositories_of(project_id) - repositories.each {|repository| repository.process_repository } + self.project_id = created_project.id end def create_kalibro_project Kalibro::Project.create( - :id => project_id, :name => name, :description => description ) 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 bc763c5..86d9487 100644 --- a/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb +++ b/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb @@ -2,14 +2,6 @@ <% @project = @article.title.nil? ? nil : @article.project - begin - @repository_types = Kalibro::Repository.repository_types.sort - @configuration_names = Kalibro::Configuration.all_names.sort - rescue Exception => exception - @article.errors.add_to_base(exception.message) - @repository_types = [] - @configuration_names = [] - end %> <%= error_messages_for 'project_content' %> @@ -24,28 +16,5 @@ <%= required f.text_field(:name) %> <% end %> -<% selected = (@project.nil? ? "" : @project.license) %> -<%= required labelled_form_field _('License'), - f.select(:project_license, MezuroPlugin::Helpers::ContentViewerHelper.create_license_options ,{:selected => selected}) %>
- <%= f.text_field :description %>
-<% @selected = (@project.nil? ? @repository_types : @project.repository.type) %> -<%= required labelled_form_field _('Repository type'), - f.select(:repository_type, @repository_types, {:selected => @selected}) %>
- -<%= required f.text_field(:repository_url) %>
- -<% @selected = (@project.nil? ? @configuration_names[0] : @project.configuration_name) %> - -<% if !@project.nil? && !@article.id.nil? %> - <%= required labelled_form_field _('Configuration') + " (Changing the configuration will erase your saved periodic avaliations)", - f.select(:configuration_name, @configuration_names, {:selected => @selected}) %> -<% else %> - <%= required labelled_form_field _('Configuration'), - f.select(:configuration_name, @configuration_names, {:selected => @selected}) %>
-<% end %> - -<% selected = (@project.nil? ? 0 : @project.process_period.to_i) %> -<%= required labelled_form_field _('Periodic Avaliation'), - f.select(:periodicity_in_days, MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options ,{:selected => selected}) %>
diff --git a/plugins/mezuro/views/content_viewer/show_project.rhtml b/plugins/mezuro/views/content_viewer/show_project.rhtml index d821ee4..e7c23f9 100644 --- a/plugins/mezuro/views/content_viewer/show_project.rhtml +++ b/plugins/mezuro/views/content_viewer/show_project.rhtml @@ -1,5 +1,3 @@ - - <% @project = @page.project %> <% unless @page.errors[:base].nil? %> <% if @page.errors[:base] =~ /There is no project named/ %> @@ -16,44 +14,9 @@ <%= @project.name %> - <%= _('License') %> - <%= @project.license %> - - <%= _('Description') %> <%= @project.description %> - - <%= _('Repository type') %> - <%= @project.repository.type %> - - - <%= _('Repository address') %> - <%= @project.repository.address %> - - - <%= _('Configuration') %> - <%= @project.configuration_name %> - - - <%= _('Periodicity') %> - <%= MezuroPlugin::Helpers::ContentViewerHelper.get_periodicity_option(@page.periodicity_in_days) %> - - - <%= _('Status')%> - -
<%= @project.state %>
-
- - -
- -
-
-
-
-
<% end %> -- libgit2 0.21.2