From baef9f39bd9b73e1ac7796bae8912e60d43268f2 Mon Sep 17 00:00:00 2001
From: Diego Araújo + João Machini <digoamc90@gmail.com>
Date: Thu, 31 May 2012 14:53:39 -0300
Subject: [PATCH] [Mezuro] Edit project is now showing the right periodicity.

---
 plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb | 4 +++-
 plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb  | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
index dac8121..5cdad46 100644
--- a/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
+++ b/plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
@@ -20,6 +20,8 @@ class MezuroPlugin::Helpers::ContentViewerHelper
   end
 
   def self.get_periodicity_option(index)
-   [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]][index.to_i][0]
+   options = [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]]
+   selected_option = options.find { |option| option.last == index.to_i }
+   selected_option.first
   end
 end
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 ec5381f..6c1c616 100644
--- a/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb
+++ b/plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb
@@ -32,8 +32,9 @@
 <% @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}) %><br/>
+  f.select(:configuration_name, @configuration_names, {:selected => @selected}) %><br/>
 
-<% @selected = (@project.nil? ? 0 : @kalibro_client.process_period(@article.title)) %>
+
+<% selected = (@project.nil? ? 0 : @kalibro_client.process_period(@article.title).to_i) %>
 <%= required labelled_form_field _('Periodic Avaliation'),
-  f.select(:periodicity_in_days, MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options ,{:selected => @selected}) %><br/>
+  f.select(:periodicity_in_days, MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options ,{:selected => selected}) %><br/>
--
libgit2 0.21.2