Download as
Browse Code »

Commit f586dcd86af9a4aa9ca580f6cdcc262574b3803d

Authored by João M. M. da Silva + Alessandro Palmeira
Committed by Paulo Meireles
1 parent 820be114
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] processing error in module_result.

Showing 5 changed files with 17 additions and 7 deletions   Show diff stats
plugins/mezuro/controllers/profile/mezuro_plugin_module_controller.rb
  Diff comments   View file @f586dcd
@@ -55,11 +55,6 @@ class MezuroPluginModuleController < MezuroPluginProfileController @@ -55,11 +55,6 @@ class MezuroPluginModuleController < MezuroPluginProfileController
55 end 55 end
56 end 56 end
57 57
58 - def redirect_to_error_page(message)  
59 - message = URI.escape(CGI.escape(message),'.')  
60 - redirect_to "/profile/#{profile.identifier}/plugins/mezuro/error_page?message=#{message}"  
61 - end  
62 -  
63 def format_date_to_simple_form date 58 def format_date_to_simple_form date
64 date.to_s[0..9] 59 date.to_s[0..9]
65 end 60 end
plugins/mezuro/controllers/profile/mezuro_plugin_profile_controller.rb
  Diff comments   View file @f586dcd
@@ -2,12 +2,25 @@ class MezuroPluginProfileController < ProfileController @@ -2,12 +2,25 @@ class MezuroPluginProfileController < ProfileController
2 2
3 append_view_path File.join(File.dirname(__FILE__) + '/../../views') 3 append_view_path File.join(File.dirname(__FILE__) + '/../../views')
4 4
  5 + rescue_from Exception do |exception|
  6 + @message = process_error_message exception.message
  7 + render :partial => "error_page"
  8 + end
  9 +
5 def error_page 10 def error_page
6 @message = params[:message] 11 @message = params[:message]
7 end 12 end
8 13
9 protected 14 protected
10 15
  16 + def process_error_message message
  17 + if message =~ /undefined method `module' for nil:NilClass/
  18 + "Kalibro did not return any result. Verify if the selected configuration is correct."
  19 + else
  20 + message
  21 + end
  22 + end
  23 +
11 def project_content_has_errors? 24 def project_content_has_errors?
12 not @content.errors[:base].nil? 25 not @content.errors[:base].nil?
13 end 26 end
plugins/mezuro/views/mezuro_plugin_module/_error_page.html.erb 0 → 100644
  Diff comments   View file @f586dcd
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +<h2> An error occured: </h2>
  2 +<%= @message %>
plugins/mezuro/views/mezuro_plugin_profile/_error_page.html.erb 0 → 100644
  Diff comments   View file @f586dcd
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +<h2> An error occured: </h2>
  2 +<%= @message %>
plugins/mezuro/views/mezuro_plugin_profile/error_page.html.erb
View file @820be11
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
1 -<h2> An error occured: </h2>  
2 -<%= @message %>