Download as
Browse Code »

Commit a851177bc6ed099536a57a9df08cdf603e84ce61

Authored by Diego Camarinha
Committed by Paulo Meireles
1 parent 370a40f7
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] Trying to solve some errors with the date

Showing 3 changed files with 6 additions and 14 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @a851177
@@ -26,8 +26,7 @@ class MezuroPluginProfileController < ProfileController @@ -26,8 +26,7 @@ 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 - project_result = date.nil? ? content.project_result : content.get_date_result(date)  
30 - module_result = content.module_result(params[:module_name]) 29 + module_result = content.module_result(params[:module_name], date)
31 render :partial => 'content_viewer/module_result', :locals => { :module_result => module_result} 30 render :partial => 'content_viewer/module_result', :locals => { :module_result => module_result}
32 end 31 end
33 32
@@ -35,7 +34,6 @@ class MezuroPluginProfileController < ProfileController @@ -35,7 +34,6 @@ class MezuroPluginProfileController < ProfileController
35 content = profile.articles.find(params[:id]) 34 content = profile.articles.find(params[:id])
36 date = params[:date] 35 date = params[:date]
37 project_result = date.nil? ? content.project_result : content.get_date_result(date) 36 project_result = date.nil? ? content.project_result : content.get_date_result(date)
38 - project_result = content.project_result  
39 source_tree = project_result.node_of(params[:module_name]) 37 source_tree = project_result.node_of(params[:module_name])
40 render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name} 38 render :partial =>'content_viewer/source_tree', :locals => { :source_tree => source_tree, :project_name => content.project.name}
41 end 39 end
plugins/mezuro/lib/kalibro/client/module_result_client.rb
  Diff comments   View file @a851177
@@ -16,12 +16,4 @@ class Kalibro::Client::ModuleResultClient @@ -16,12 +16,4 @@ class Kalibro::Client::ModuleResultClient
16 {:project_name => project_name, :module_name => module_name})[:module_result] 16 {:project_name => project_name, :module_name => module_name})[:module_result]
17 Kalibro::Entities::Entity.new.to_entity_array(value, Kalibro::Entities::ModuleResult) 17 Kalibro::Entities::Entity.new.to_entity_array(value, Kalibro::Entities::ModuleResult)
18 end 18 end
19 -  
20 - private  
21 -  
22 - def date_with_milliseconds(date)  
23 - milliseconds = "." + (date.sec_fraction * 60 * 60 * 24 * 1000).to_s  
24 - date.to_s[0..18] + milliseconds + date.to_s[19..-1]  
25 - end  
26 -  
27 end 19 end
plugins/mezuro/lib/mezuro_plugin/project_content.rb
  Diff comments   View file @a851177
@@ -34,9 +34,11 @@ class MezuroPlugin::ProjectContent < Article @@ -34,9 +34,11 @@ class MezuroPlugin::ProjectContent < Article
34 @project_result ||= client.has_results_before(name, date) ? client.last_result_before(name, date) : client.first_result_after(name, date) 34 @project_result ||= client.has_results_before(name, date) ? client.last_result_before(name, date) : client.first_result_after(name, date)
35 end 35 end
36 36
37 - def module_result(module_name)  
38 - module_name = project.name if module_name.nil?  
39 - @module_client ||= module_result_client.module_result(project.name, module_name, project_result.date) 37 + def module_result(module_name, date)
  38 + module_name = project.name if module_name.nil?
  39 +#FIXME date format is wrong
  40 + date = project_result.date if date.nil?
  41 + @module_client ||= module_result_client.module_result(project.name, module_name, date)
40 end 42 end
41 43
42 def result_history(module_name) 44 def result_history(module_name)