Download as
Browse Code »

Commit 61a3224afdd27e779bd843f9211133fbb5920e64

Authored by Alessandro Palmeira + Diego Araújo + João M. M. da Silva
Committed by João M. M. da Silva
1 parent 24336d9e
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] Started to refactor configuration model.

Showing 2 changed files with 16 additions and 13 deletions   Show diff stats
plugins/mezuro/lib/kalibro/configuration.rb
  Diff comments   View file @61a3224
1 class Kalibro::Configuration < Kalibro::Model 1 class Kalibro::Configuration < Kalibro::Model
2 2
3 - attr_accessor :name, :description, :id 3 + attr_accessor :id, :name, :description
  4 +
4 =begin 5 =begin
5 def metric_configuration=(value) 6 def metric_configuration=(value)
6 @metric_configuration = Kalibro::MetricConfiguration.to_objects_array value 7 @metric_configuration = Kalibro::MetricConfiguration.to_objects_array value
plugins/mezuro/lib/mezuro_plugin/configuration_content.rb
  Diff comments   View file @61a3224
1 class MezuroPlugin::ConfigurationContent < Article 1 class MezuroPlugin::ConfigurationContent < Article
2 validate_on_create :validate_kalibro_configuration_name 2 validate_on_create :validate_kalibro_configuration_name
3 3
4 - settings_items :description, :configuration_to_clone_name 4 + settings_items :kalibro_id, :description, :configuration_to_clone_name
5 5
6 after_save :send_kalibro_configuration_to_service 6 after_save :send_kalibro_configuration_to_service
7 after_destroy :remove_kalibro_configuration_from_service 7 after_destroy :remove_kalibro_configuration_from_service
@@ -23,29 +23,31 @@ class MezuroPlugin::ConfigurationContent &lt; Article @@ -23,29 +23,31 @@ class MezuroPlugin::ConfigurationContent &lt; Article
23 23
24 def kalibro_configuration 24 def kalibro_configuration
25 begin 25 begin
26 - @kalibro_configuration ||= Kalibro::Configuration.find_by_name(self.name) 26 + @kalibro_configuration ||= Kalibro::Configuration.find(self.kalibro_id)
27 rescue Exception => exception 27 rescue Exception => exception
28 errors.add_to_base(exception.message) 28 errors.add_to_base(exception.message)
29 end 29 end
30 @kalibro_configuration 30 @kalibro_configuration
31 end 31 end
32 32
33 - def metric_configurations  
34 - kalibro_configuration.metric_configurations  
35 - end 33 +# def metric_configurations
  34 +# kalibro_configuration.metric_configurations
  35 +# end
36 36
37 - def kalibro_configuration_names 37 + def kalibro_configuration_names_and_ids
  38 + all_names_and_ids = {}
38 begin 39 begin
39 - all_configuration_names = Kalibro::Configuration.all_names  
40 - if all_configuration_names.nil?  
41 - ["None"]  
42 - else  
43 - ["None"] + all_configuration_names.sort 40 + all_configurations = Kalibro::Configuration.all
  41 + if(!all_configurations.nil?)
  42 + all_configuration.each do |configuration|
  43 + all_names_and_ids[configuration.id] = configuration.name
  44 + end
44 end 45 end
45 rescue Exception => exception 46 rescue Exception => exception
46 errors.add_to_base(exception.message) 47 errors.add_to_base(exception.message)
47 - ["None"]  
48 end 48 end
  49 + all_names_and_ids[-1] = "None"
  50 + all_names_and_ids
49 end 51 end
50 52
51 private 53 private