diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb
index ba36ae9..e2b9b30 100644
--- a/plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb
+++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb
@@ -3,8 +3,8 @@ class MezuroPluginMyprofileController < ProfileController #MyprofileController?
append_view_path File.join(File.dirname(__FILE__) + '/../../views')
rescue_from Exception do |exception|
- message = URI.escape(CGI.escape(exception.message),'.')
- redirect_to_error_page message
+ @message = process_error_message exception.message
+ render :partial => "error_page"
end
def error_page
@@ -26,7 +26,7 @@ class MezuroPluginMyprofileController < ProfileController #MyprofileController?
protected
def redirect_to_error_page(message)
- message = URI.escape(CGI.escape(message),'.')
+ message = URI.escape(CGI.escape(process_error_message(message)),'.')
redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
end
@@ -34,4 +34,12 @@ class MezuroPluginMyprofileController < ProfileController #MyprofileController?
not metric_configuration.errors.empty?
end
+ def process_error_message message
+ if message =~ /bla/
+ message
+ else
+ message
+ end
+ end
+
end
diff --git a/plugins/mezuro/views/mezuro_plugin_base_tool/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_base_tool/_error_page.html.erb
new file mode 100644
index 0000000..089af13
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_base_tool/_error_page.html.erb
@@ -0,0 +1,2 @@
+
An error occured:
+<%= @message %>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_error_page.html.erb
new file mode 100644
index 0000000..089af13
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_error_page.html.erb
@@ -0,0 +1,2 @@
+ An error occured:
+<%= @message %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_error_page.html.erb
new file mode 100644
index 0000000..089af13
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_myprofile/_error_page.html.erb
@@ -0,0 +1,2 @@
+ An error occured:
+<%= @message %>
diff --git a/plugins/mezuro/views/mezuro_plugin_project/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_project/_error_page.html.erb
new file mode 100644
index 0000000..089af13
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_project/_error_page.html.erb
@@ -0,0 +1,2 @@
+ An error occured:
+<%= @message %>
diff --git a/plugins/mezuro/views/mezuro_plugin_range/_error_page.html.erb b/plugins/mezuro/views/mezuro_plugin_range/_error_page.html.erb
new file mode 100644
index 0000000..089af13
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_range/_error_page.html.erb
@@ -0,0 +1,2 @@
+ An error occured:
+<%= @message %>
diff --git a/plugins/mezuro/views/mezuro_plugin_range/create_range.rjs b/plugins/mezuro/views/mezuro_plugin_range/create_range.rjs
index f0cf9ee..de71f74 100644
--- a/plugins/mezuro/views/mezuro_plugin_range/create_range.rjs
+++ b/plugins/mezuro/views/mezuro_plugin_range/create_range.rjs
@@ -1,2 +1,3 @@
+page.alert @message
page.visual_effect :toggle_slide, "range_form"
page.insert_html :bottom, "ranges", :partial => "range", :locals => {:range => @range}
diff --git a/plugins/mezuro/views/mezuro_plugin_range/edit_range.rjs b/plugins/mezuro/views/mezuro_plugin_range/edit_range.rjs
index 2358788..1bfba97 100644
--- a/plugins/mezuro/views/mezuro_plugin_range/edit_range.rjs
+++ b/plugins/mezuro/views/mezuro_plugin_range/edit_range.rjs
@@ -1,2 +1,3 @@
page.replace_html 'range_form', :partial => "edit_range", :locals => {:metric_name => @metric_name, :id => @configuration_content.id, :beginning_id => @beginning_id, :range => @range }
page.visual_effect :slide_down, "range_form"
+
diff --git a/plugins/mezuro/views/mezuro_plugin_range/new_range.rjs b/plugins/mezuro/views/mezuro_plugin_range/new_range.rjs
index fa13dee..dbfaddf 100644
--- a/plugins/mezuro/views/mezuro_plugin_range/new_range.rjs
+++ b/plugins/mezuro/views/mezuro_plugin_range/new_range.rjs
@@ -1,2 +1,3 @@
page.replace_html 'range_form', :partial => "new_range", :locals => {:metric_name => @metric_name, :id => @configuration_content.id }
page.visual_effect :slide_down, "range_form"
+
--
libgit2 0.21.2