[Mezuro] Feature of create a configuration based on a old one

João M. M. da Silva
1 parent 4cbb0d67
Showing 5 changed files with 58 additions and 28 deletions Show diff stats
plugins/mezuro/lib/kalibro/configuration.rb
plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
plugins/mezuro/test/unit/mezuro_plugin/configuration_content_test.rb
plugins/mezuro/views/cms/mezuro_plugin/_configuration_content.html.erb
plugins/mezuro/views/content_viewer/show_configuration.rhtml
@@ -22,10 +22,11 @@ class Kalibro::Configuration &lt; Kalibro::Model
     new request("Configuration", :get_configuration, {:configuration_name => configuration_name})[:configuration]
   end
-  def self.create(content)
-	  attributes = {
-	    :name => content.name,
-  	  :description => content.description
+  def self.create(content, configuration)
+    attributes = {
+      :name => content.name,
+      :description => content.description,
+      :metric_configuration => configuration.to_hash[:metric_configuration]
   	}
   	super attributes
   end
@@ -34,7 +35,13 @@ class Kalibro::Configuration &lt; Kalibro::Model
     request("Configuration", :get_configuration_names)[:configuration_name]
   end
-  def destroy 
+  def destroy
     self.class.request("Configuration", :remove_configuration, {:configuration_name => name})
   end
+
+  def update_attributes(attributes={})
+    attributes.each { |field, value| send("#{field}=", value) if self.class.is_valid?(field) }
+    save
+  end
+
 end
@@ -9,7 +9,7 @@ class MezuroPlugin::ConfigurationContent &lt; Article
     'Sets of thresholds to interpret metrics'
   end
-  settings_items :description
+  settings_items :description, :clone_configuration_name
   include ActionView::Helpers::TagHelper
   def to_html(options = {})
@@ -20,21 +20,20 @@ class MezuroPlugin::ConfigurationContent &lt; Article
   def configuration
     begin
-      configuration = Kalibro::Configuration.find_by_name(self.name)
-      configuration.description = self.description
-      configuration
-    rescue Exception
-      Kalibro::Configuration.new({
-        :name => self.name,
-        :description => self.description
-      })
+      @configuration ||= Kalibro::Configuration.find_by_name(self.name)
+    rescue Exception => error
+      errors.add_to_base(error.message)
+      nil
     end
   end
-  
+
   def metric_configurations
     configuration.metric_configurations
   end
-  
+
+  def configuration_names
+    ["None"] + Kalibro::Configuration.all_names.sort
+  end
   after_save :send_configuration_to_service
   after_destroy :remove_configuration_from_service
@@ -42,8 +41,7 @@ class MezuroPlugin::ConfigurationContent &lt; Article
   private
   def validate_kalibro_configuration_name
-    existing = Kalibro::Configuration.all_names
-    existing.each { |a| a.downcase!}
+    existing = configuration_names.map { |a| a.downcase}
     if existing.include?(name.downcase)
       errors.add_to_base("Configuration name already exists in Kalibro")
@@ -51,11 +49,24 @@ class MezuroPlugin::ConfigurationContent &lt; Article
   end
   def send_configuration_to_service
-    configuration.save
+    if configuration.nil?
+      begin
+        clone_configuration = Kalibro::Configuration.find_by_name(self.clone_configuration_name)
+      rescue Exception => error
+        clone_configuration = nil
+      end
+      Kalibro::Configuration.create(self, clone_configuration)
+    else
+      configuration.update_attributes({:description => description})
+    end
   end
   def remove_configuration_from_service
-    configuration.destroy
+    begin
+      configuration.destroy
+    rescue Exception => error
+      errors.add_to_base(error.message)
+    end
   end
 end
@@ -61,5 +61,5 @@ class ConfigurationContentTest &lt; ActiveSupport::TestCase
     @configuration.expects(:destroy)
     @content.send :remove_configuration_from_service
   end
-  
+
 end
 <h1> <%= _(MezuroPlugin::ConfigurationContent.short_description) %> </h1>
 <%
-begin
-  @configuration = @article.title.nil? ? nil : Kalibro::Configuration.find_by_name(@article.title)
-rescue
-  @configuration = nil
-end 
+  begin
+    configuration = @article.title.nil? ? nil : @article.configuration
+  rescue
+    configuration = nil
+  end
 %>
 <%= error_messages_for 'kalibro_configuration' %>
@@ -13,8 +13,20 @@ end
 <%= hidden_field_tag 'kalibro_configuration[profile_id]', profile.id %>
 <%= hidden_field_tag 'id', @article.id %>
+<% configuration_names = @article.configuration_names %>
+
+<% selected = (configuration.nil? ? configuration_names[0] : @article.clone_configuration_name) %>
+
 <%= required_fields_message %>
-<%= required f.text_field(:name, :disabled => !(@configuration.nil? || @article.id.nil?)) %>
+<%= required labelled_form_field _('Clone Configuration'),
+if !configuration.nil? && !@article.id.nil?
+  f.select(:clone_configuration_name, configuration_names, {:selected => selected}, :disabled => 'true')
+else
+  f.select(:clone_configuration_name, configuration_names, {:selected => selected})
+end %>
+<br/>
+
+<%= required f.text_field(:name, :disabled => !(configuration.nil? || @article.id.nil?)) %>
 <%= f.text_field :description %><br/>
 <% @configuration_content = @page
-@configuration = Kalibro::Configuration.find_by_name(@configuration_content.name) %>
+@configuration = @page.configuration %>
 <table id="project_info">
   <tr>
	@@ -61,5 +61,5 @@ class ConfigurationContentTest < ActiveSupport::TestCase		@@ -61,5 +61,5 @@ class ConfigurationContentTest < ActiveSupport::TestCase
61	@configuration.expects(:destroy)	61	@configuration.expects(:destroy)
62	@content.send :remove_configuration_from_service	62	@content.send :remove_configuration_from_service
63	end	63	end
64	-	64	+
65	end	65	end
1	<h1> <%= _(MezuroPlugin::ConfigurationContent.short_description) %> </h1>	1	<h1> <%= _(MezuroPlugin::ConfigurationContent.short_description) %> </h1>
2		2
3	<%	3	<%
4	-begin
5	- @configuration = @article.title.nil? ? nil : Kalibro::Configuration.find_by_name(@article.title)
6	-rescue
7	- @configuration = nil
8	-end	4	+ begin
		5	+ configuration = @article.title.nil? ? nil : @article.configuration
		6	+ rescue
		7	+ configuration = nil
		8	+ end
9	%>	9	%>
10		10
11	<%= error_messages_for 'kalibro_configuration' %>	11	<%= error_messages_for 'kalibro_configuration' %>
	@@ -13,8 +13,20 @@ end		@@ -13,8 +13,20 @@ end
13	<%= hidden_field_tag 'kalibro_configuration[profile_id]', profile.id %>	13	<%= hidden_field_tag 'kalibro_configuration[profile_id]', profile.id %>
14	<%= hidden_field_tag 'id', @article.id %>	14	<%= hidden_field_tag 'id', @article.id %>
15		15
		16	+<% configuration_names = @article.configuration_names %>
		17	+
		18	+<% selected = (configuration.nil? ? configuration_names[0] : @article.clone_configuration_name) %>
		19	+
16	<%= required_fields_message %>	20	<%= required_fields_message %>
17		21
18	-<%= required f.text_field(:name, :disabled => !(@configuration.nil? \|\| @article.id.nil?)) %>	22	+<%= required labelled_form_field _('Clone Configuration'),
		23	+if !configuration.nil? && !@article.id.nil?
		24	+ f.select(:clone_configuration_name, configuration_names, {:selected => selected}, :disabled => 'true')
		25	+else
		26	+ f.select(:clone_configuration_name, configuration_names, {:selected => selected})
		27	+end %>
		28	+<br/>
		29	+
		30	+<%= required f.text_field(:name, :disabled => !(configuration.nil? \|\| @article.id.nil?)) %>
19		31
20	<%= f.text_field :description %><br/>	32	<%= f.text_field :description %><br/>
1	<% @configuration_content = @page	1	<% @configuration_content = @page
2	-@configuration = Kalibro::Configuration.find_by_name(@configuration_content.name) %>	2	+@configuration = @page.configuration %>
3		3
4	<table id="project_info">	4	<table id="project_info">
5	<tr>	5	<tr>