From 8c1a9b4ceac1b4a84a5cd8b5878f5d68e1e03839 Mon Sep 17 00:00:00 2001 From: João M. M. da Silva + Diego Araújo Date: Wed, 1 Feb 2012 17:02:53 +0300 Subject: [PATCH] Saving a new metric configuration --- plugins/mezuro/lib/kalibro/client/configuration_client.rb | 6 +++++- plugins/mezuro/lib/kalibro/client/port.rb | 2 +- plugins/mezuro/lib/kalibro/entities/configuration.rb | 2 +- plugins/mezuro/lib/mezuro_plugin.rb | 4 ++-- plugins/mezuro/lib/mezuro_plugin/kalibro_configuration.rb | 1 + plugins/mezuro/views/cms/mezuro_plugin/_kalibro_configuration.html.erb | 13 +++++++++++++ 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/plugins/mezuro/lib/kalibro/client/configuration_client.rb b/plugins/mezuro/lib/kalibro/client/configuration_client.rb index f372146..2ec0e2d 100644 --- a/plugins/mezuro/lib/kalibro/client/configuration_client.rb +++ b/plugins/mezuro/lib/kalibro/client/configuration_client.rb @@ -8,6 +8,10 @@ class Kalibro::Client::ConfigurationClient @port.request(:save_configuration, {:configuration => configuration.to_hash}) end + def self.save(configuration) + new.save(configuration) + end + def configuration_names @port.request(:get_configuration_names)[:configuration_name].to_a end @@ -21,4 +25,4 @@ class Kalibro::Client::ConfigurationClient @port.request(:remove_configuration, {:configuration_name => configuration_name}) end -end \ No newline at end of file +end diff --git a/plugins/mezuro/lib/kalibro/client/port.rb b/plugins/mezuro/lib/kalibro/client/port.rb index 997e94d..96a50b1 100644 --- a/plugins/mezuro/lib/kalibro/client/port.rb +++ b/plugins/mezuro/lib/kalibro/client/port.rb @@ -11,7 +11,7 @@ class Kalibro::Client::Port end def service_address - @service_address ||= 'http://localhost:8080/KalibroService/' + @service_address ||= 'http://valinhos.ime.usp.br:50688/KalibroService/' end def request(action, request_body = nil) diff --git a/plugins/mezuro/lib/kalibro/entities/configuration.rb b/plugins/mezuro/lib/kalibro/entities/configuration.rb index ceaf77f..3ed1a48 100644 --- a/plugins/mezuro/lib/kalibro/entities/configuration.rb +++ b/plugins/mezuro/lib/kalibro/entities/configuration.rb @@ -14,4 +14,4 @@ class Kalibro::Entities::Configuration < Kalibro::Entities::Entity @metric_configuration = metric_configurations end -end \ No newline at end of file +end diff --git a/plugins/mezuro/lib/mezuro_plugin.rb b/plugins/mezuro/lib/mezuro_plugin.rb index 8b36374..68c525b 100644 --- a/plugins/mezuro/lib/mezuro_plugin.rb +++ b/plugins/mezuro/lib/mezuro_plugin.rb @@ -9,8 +9,8 @@ class MezuroPlugin < Noosfero::Plugin end def content_types - [MezuroPlugin::ProjectContent, - MezuroPlugin::KalibroConfiguration] + # [MezuroPlugin::ProjectContent, + MezuroPlugin::KalibroConfiguration #] end def stylesheet? diff --git a/plugins/mezuro/lib/mezuro_plugin/kalibro_configuration.rb b/plugins/mezuro/lib/mezuro_plugin/kalibro_configuration.rb index 730f513..a365a85 100644 --- a/plugins/mezuro/lib/mezuro_plugin/kalibro_configuration.rb +++ b/plugins/mezuro/lib/mezuro_plugin/kalibro_configuration.rb @@ -38,6 +38,7 @@ class MezuroPlugin::KalibroConfiguration < Article configuration = Kalibro::Entities::Configuration.new configuration.name = title configuration.description = description + configuration.metric_configuration = 0 configuration end diff --git a/plugins/mezuro/views/cms/mezuro_plugin/_kalibro_configuration.html.erb b/plugins/mezuro/views/cms/mezuro_plugin/_kalibro_configuration.html.erb index e8eb944..3af22f1 100644 --- a/plugins/mezuro/views/cms/mezuro_plugin/_kalibro_configuration.html.erb +++ b/plugins/mezuro/views/cms/mezuro_plugin/_kalibro_configuration.html.erb @@ -18,3 +18,16 @@ <%= required f.text_field(:name) %> <%= f.text_field :description %>
+ +<% @repository_types = Kalibro::Client::KalibroClient.new.supported_repository_types.sort %> +<% @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) %>
+ +<% @configuration_names = Kalibro::Client::ConfigurationClient.new.configuration_names.sort %> +<% @selected = (@project.nil? ? @configuration_names[0] : @project.configuration_name) %> +<%= required labelled_form_field _('Configuration'), + f.select(:configuration_name, @configuration_names.sort, {:selected => @selected}) %>
+ -- libgit2 0.21.2