Download as
Browse Code »

Commit 6f099471203b0458bc6c98b0ab54d1af64545950

Authored by João M. M. da Silva + Diego Araújo
Committed by João M. M. da Silva
1 parent 25cb803e
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

[Mezuro] draft to fix edit project periodicity

Showing 3 changed files with 9 additions and 3 deletions   Show diff stats
plugins/mezuro/lib/mezuro_plugin/helpers/content_viewer_helper.rb
  Diff comments   View file @6f09947
@@ -18,4 +18,8 @@ class MezuroPlugin::Helpers::ContentViewerHelper @@ -18,4 +18,8 @@ class MezuroPlugin::Helpers::ContentViewerHelper
18 :data => values, 18 :data => values,
19 :axis_with_labels => 'y') 19 :axis_with_labels => 'y')
20 end 20 end
  21 +
  22 + def self.get_periodicity_option(index)
  23 + [["Not Periodically", 0], ["1 day", 1], ["2 days", 2], ["Weekly", 7], ["Biweeky", 15], ["Monthly", 30]][index.to_i][0]
  24 + end
21 end 25 end
plugins/mezuro/views/cms/mezuro_plugin/_project_content.html.erb
  Diff comments   View file @6f09947
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 <% 3 <%
4 begin 4 begin
5 @project = @article.title.nil? ? nil : Kalibro::Client::ProjectClient.project(@article.title) 5 @project = @article.title.nil? ? nil : Kalibro::Client::ProjectClient.project(@article.title)
  6 + @kalibro_client = Kalibro::Client::KalibroClient.new
6 rescue 7 rescue
7 @project = nil 8 @project = nil
8 end 9 end
@@ -21,7 +22,7 @@ @@ -21,7 +22,7 @@
21 22
22 <%= f.text_field :description %><br/> 23 <%= f.text_field :description %><br/>
23 24
24 -<% @repository_types = Kalibro::Client::KalibroClient.new.supported_repository_types.sort %> 25 +<% @repository_types = @kalibro_client.supported_repository_types.sort %>
25 <% @selected = (@project.nil? ? @repository_types : @project.repository.type) %> 26 <% @selected = (@project.nil? ? @repository_types : @project.repository.type) %>
26 <%= required labelled_form_field _('Repository type'), 27 <%= required labelled_form_field _('Repository type'),
27 f.select(:repository_type, @repository_types, {:selected => @selected}) %><br/> 28 f.select(:repository_type, @repository_types, {:selected => @selected}) %><br/>
@@ -33,5 +34,6 @@ @@ -33,5 +34,6 @@
33 <%= required labelled_form_field _('Configuration'), 34 <%= required labelled_form_field _('Configuration'),
34 f.select(:configuration_name, @configuration_names.sort, {:selected => @selected}) %><br/> 35 f.select(:configuration_name, @configuration_names.sort, {:selected => @selected}) %><br/>
35 36
  37 +<% @periodicity = (@project.nil? ? 0 : @kalibro_client.process_period(@project.name)) %>
36 <%= required labelled_form_field _('Periodic Avaliation'), 38 <%= required labelled_form_field _('Periodic Avaliation'),
37 - f.select(:periodicity_in_days, MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options ,{:selected => 0}) %><br/> 39 + f.select(:periodicity_in_days, MezuroPlugin::Helpers::ContentViewerHelper.create_periodicity_options ,{:selected => @periodicity}) %><br/>
plugins/mezuro/views/content_viewer/show_project.rhtml
  Diff comments   View file @6f09947
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 </tr> 34 </tr>
35 <tr> 35 <tr>
36 <td><%= _('Periodicity') %></td> 36 <td><%= _('Periodicity') %></td>
37 - <td><%= @project.periodicity_in_days %> </td> 37 + <td><%= MezuroPlugin::Helpers::ContentViewerHelper.get_periodicity_option(@page.periodicity_in_days) %></td>
38 </tr> 38 </tr>
39 <tr> 39 <tr>
40 <td><%= _('Status')%></td> 40 <td><%= _('Status')%></td>