Download as
Browse Code »

Commit 087a62e6de6a7f49b9efd41ab1f3ea06cc829d66

Authored by Caio Salgado + Renan Teruo
Committed by Paulo Meireles
1 parent 749d8666
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] Javascript actually reloads page after changing dates. Controller now k… 

…nows date, and should talk with Kalibro with different dates.
Showing 2 changed files with 9 additions and 0 deletions   Show diff stats
plugins/mezuro/controllers/mezuro_plugin_profile_controller.rb
  Diff comments   View file @087a62e
... ... @@ -16,11 +16,19 @@ class MezuroPluginProfileController < ProfileController
16 16 end
17 17  
18 18 def project_result
  19 +
  20 + date = params[:date]
19 21  
20 22 content = profile.articles.find(params[:id])
21 23 project_result = content.project_result
22 24 project = content.project
23 25  
  26 + if date_verify(date)
  27 + client = Kalibro::Client::ProjectResultClient.new
  28 + if client.has_results_before(project.name, date)
  29 + project_result = client.last_result_before(project.name, date)
  30 + end
  31 + end
24 32 history = project_history project
25 33  
26 34 render :partial => 'content_viewer/project_result', :locals => { :project_result => project_result, :history => history }
... ...
plugins/mezuro/public/javascripts/project_content.js
  Diff comments   View file @087a62e
... ... @@ -26,6 +26,7 @@ function reloadModule(){
26 26 }
27 27  
28 28 function reloadProject(date){
  29 + showLoadingProcess(true);
29 30 callAction('project_result', {date: date}, showProjectResult);
30 31 callAction('project_tree', {date: date}, showProjectTree);
31 32 callAction('module_result', {date: date}, showModuleResult);
... ...