Download as
Browse Code »

Commit d0a7610131ca41ccc67ce9c240957ed05da15a3f

Authored by Caio
Committed by Paulo Meireles
1 parent a851177b
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

[Mezuro] re-organizing controllers methods

Showing 3 changed files with 16 additions and 14 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
  Diff comments   View file @d0a7610
@@ -99,14 +99,6 @@ class MezuroPluginMyprofileController < ProfileController @@ -99,14 +99,6 @@ class MezuroPluginMyprofileController < ProfileController
99 redirect_to "/#{profile.identifier}/#{configuration_name.downcase.gsub(/\s/, '-')}" 99 redirect_to "/#{profile.identifier}/#{configuration_name.downcase.gsub(/\s/, '-')}"
100 end 100 end
101 101
102 - def module_metrics_history  
103 - metric_name = params[:metric_name]  
104 - content = profile.articles.find(params[:id])  
105 - module_history = content.result_history(params[:module_name])  
106 - date_history = module_history.collect { |x| x.date }  
107 - metric_history = module_history.collect { |x| (x.metric_results.select { |y| y.metric.name.delete("() ") == metric_name })[0] }  
108 - render :partial => 'content_viewer/metric_history', :locals => {:metric_history => metric_history, :date_history => date_history }  
109 - end  
110 private 102 private
111 103
112 def new_metric_configuration_instance 104 def new_metric_configuration_instance
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @d0a7610
@@ -26,7 +26,8 @@ class MezuroPluginProfileController < ProfileController @@ -26,7 +26,8 @@ class MezuroPluginProfileController < ProfileController
26 def module_result 26 def module_result
27 content = profile.articles.find(params[:id]) 27 content = profile.articles.find(params[:id])
28 date = params[:date] 28 date = params[:date]
29 - module_result = content.module_result(params[:module_name], date) 29 + project_result = date.nil? ? content.project_result : content.get_date_result(date)
  30 + module_result = content.module_result(params[:module_name])
30 render :partial => 'content_viewer/module_result', :locals => { :module_result => module_result} 31 render :partial => 'content_viewer/module_result', :locals => { :module_result => module_result}
31 end 32 end
32 33
@@ -38,4 +39,13 @@ class MezuroPluginProfileController < ProfileController @@ -38,4 +39,13 @@ class MezuroPluginProfileController < ProfileController
38 render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name} 39 render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name}
39 end 40 end
40 41
  42 + def module_metrics_history
  43 + metric_name = params[:metric_name]
  44 + content = profile.articles.find(params[:id])
  45 + module_history = content.result_history(params[:module_name])
  46 + date_history = module_history.collect { |x| x.date }
  47 + metric_history = module_history.collect { |x| (x.metric_results.select { |y| y.metric.name.delete("() ") == metric_name })[0] }
  48 + render :partial => 'content_viewer/metric_history', :locals => {:metric_history => metric_history, :date_history => date_history }
  49 + end
  50 +
41 end 51 end
plugins/mezuro/test/functional/mezuro_plugin_profile_controller_test.rb
  Diff comments   View file @d0a7610
@@ -64,11 +64,11 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase @@ -64,11 +64,11 @@ class MezuroPluginProfileControllerTest < ActionController::TestCase
64 64
65 should 'get project results from a specific date' do 65 should 'get project results from a specific date' do
66 create_project_content 66 create_project_content
67 - client = mock  
68 - Kalibro::Client::ProjectResultClient.expects(:new).returns(client)  
69 - client.expects(:has_results_before).returns(true)  
70 - client.expects(:last_result_before).returns(@project_result)  
71 - get :project_result, :profile => @profile.identifier, :id => @content.id, :date => "2012-04-13T20:39:41+04:00" 67 + client = mock
  68 + Kalibro::Client::ProjectResultClient.expects(:new).returns(client)
  69 + client.expects(:has_results_before).returns(true)
  70 + client.expects(:last_result_before).returns(@project_result)
  71 + get :project_result, :profile => @profile.identifier, :id => @content.id, :date => "2012-04-13T20:39:41+04:00"
72 assert_response 200 72 assert_response 200
73 end 73 end
74 74