Download as
Browse Code »

Commit d6b6aab814158ad49face65a1e55b4ec58007e95

Authored by João M. M. da Silva + Diego Araújo
Committed by João M. M. da Silva
1 parent 3040b2e9
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

[Mezuro] fixed call to processing with date.

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
plugins/mezuro/lib/kalibro/processing.rb
  Diff comments   View file @d6b6aab
@@ -12,6 +12,7 @@ class Kalibro::Processing < Kalibro::Model @@ -12,6 +12,7 @@ class Kalibro::Processing < Kalibro::Model
12 end 12 end
13 13
14 def self.processing_with_date_of(repository_id, date) 14 def self.processing_with_date_of(repository_id, date)
  15 + date = date.is_a?(String) ? DateTime.parse(date) : date
15 if has_processing_after(repository_id, date) 16 if has_processing_after(repository_id, date)
16 first_processing_after(repository_id, date) 17 first_processing_after(repository_id, date)
17 elsif has_processing_before(repository_id, date) 18 elsif has_processing_before(repository_id, date)
plugins/mezuro/views/mezuro_plugin_processing/_processing.rhtml
  Diff comments   View file @d6b6aab
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 jQuery(document).ready(function($) { 25 jQuery(document).ready(function($) {
26 $("#datepicker").datepicker({ 26 $("#datepicker").datepicker({
27 onSelect: function(dateText, inst) { 27 onSelect: function(dateText, inst) {
28 - reloadProjectWithDate(dateText) } }); 28 + reloadProcessingWithDate(dateText) } });
29 $("#datepicker").toggle(); 29 $("#datepicker").toggle();
30 var date = jQuery("#current_processing_date").attr('data-date').substr(0,10); 30 var date = jQuery("#current_processing_date").attr('data-date').substr(0,10);
31 $("#datepicker").datepicker( "setDate" , date ); 31 $("#datepicker").datepicker( "setDate" , date );
@@ -33,4 +33,4 @@ @@ -33,4 +33,4 @@
33 }); 33 });
34 </script> 34 </script>
35 35
36 -<span id="module_result_root_id" module_result_root_id="<%= @processing.results_root_id %>">  
37 \ No newline at end of file 36 \ No newline at end of file
  37 +<span id="module_result_root_id" module_result_root_id="<%= @processing.results_root_id %>">