[PATCH conductor] Fixing permission partial and displaying of error messages for AJAX requests - aeolus-devel - Fedora Mailing-Lists

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[PATCH conductor] Fixing permission partial and displaying of error messages for AJAX requests

[PATCH conductor 1/3] Fixing...

[PATCH conductor] Error message...

Imre Farkas

Tuesday, 27 December 2011 Tue, 27 Dec '11

12:54 p.m.

This patchset fixes the following issue: https://bugzilla.redhat.com/show_bug.cgi?id=770367

Reply

Show replies by thread

Imre Farkas

Tuesday, 27 December Tue, 27 Dec

12:54 p.m.

New subject: [PATCH conductor 1/2] Fixing the permission partial

From: Imre Farkas <ifarkas(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=770367 --- src/app/views/permissions/_permissions.html.haml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/views/permissions/_permissions.html.haml b/src/app/views/permissions/_permissions.html.haml index 3ac19de..f412570 100644 --- a/src/app/views/permissions/_permissions.html.haml +++ b/src/app/views/permissions/_permissions.html.haml @@ -6,8 +6,9 @@ = hidden_field_tag :permission_object_type, @permission_object.class.name = hidden_field_tag :permission_object_id, @permission_object.id - - @polymorphic_path_extras.each do |key, value| - = hidden_field_tag("polymorphic_path_extras[#{key}]", value) + - if @polymorphic_path_extras.present? + - @polymorphic_path_extras.each do |key, value| + = hidden_field_tag("polymorphic_path_extras[#{key}]", value) = hidden_field_tag :path_prefix, @path_prefix = hidden_field_tag :use_tabs, @use_tabs ? @use_tabs : (@tabs ? 'yes' : 'no') -- 1.7.6.4

Reply

Imre Farkas

12:54 p.m.

New subject: [PATCH conductor 2/2] Fixed error rendering for AJAX requests

From: Imre Farkas <ifarkas(a)redhat.com> --- src/app/controllers/application_controller.rb | 2 +- src/app/views/layouts/_popup-error.rhtml | 4 ++++ src/app/views/layouts/popup-error.rhtml | 4 ---- src/public/javascripts/application.js | 6 ++++-- 4 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 src/app/views/layouts/_popup-error.rhtml delete mode 100644 src/app/views/layouts/popup-error.rhtml diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 0044124..3ffaefe 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -86,7 +86,7 @@ class ApplicationController < ActionController::Base def html_error_page(title, msg, status) if request.xhr? - render :template => 'layouts/popup-error', :layout => 'popup', :status => status, + render :partial => 'layouts/popup-error', :status => status, :locals => {:title => title, :errmsg => msg} else render :template => 'layouts/error', :layout => 'application', diff --git a/src/app/views/layouts/_popup-error.rhtml b/src/app/views/layouts/_popup-error.rhtml new file mode 100644 index 0000000..094c13a --- /dev/null +++ b/src/app/views/layouts/_popup-error.rhtml @@ -0,0 +1,4 @@ +<%- content_for :title do -%> + <%= title %> +<%- end -%> +<%= errmsg %> diff --git a/src/app/views/layouts/popup-error.rhtml b/src/app/views/layouts/popup-error.rhtml deleted file mode 100644 index 094c13a..0000000 --- a/src/app/views/layouts/popup-error.rhtml +++ /dev/null @@ -1,4 +0,0 @@ -<%- content_for :title do -%> - <%= title %> -<%- end -%> -<%= errmsg %> diff --git a/src/public/javascripts/application.js b/src/public/javascripts/application.js index d2c262b..04fb4d3 100644 --- a/src/public/javascripts/application.js +++ b/src/public/javascripts/application.js @@ -20,8 +20,10 @@ $.extend(Conductor, { var url = $(this).attr('href'); $('#tab').html('<span class="loading_tabs"></span>'); $.get(url, function(data) { - $('#tab').html(data) - .show(); + $('#tab').html(data).show(); + }) + .error(function(data) { + $('#tab').html(data.responseText).show(); }); Conductor.tabRemoveActiveClass(); -- 1.7.6.4

Reply

Tomas Sedovic

Monday, 2 January Mon, 2 Jan

3:42 a.m.

New subject: [PATCH conductor 2/2] Fixed error rendering for AJAX requests

On 12/27/2011 07:54 PM, ifarkas(a)redhat.com wrote:

From: Imre Farkas<ifarkas(a)redhat.com> --- src/app/controllers/application_controller.rb | 2 +- src/app/views/layouts/_popup-error.rhtml | 4 ++++ src/app/views/layouts/popup-error.rhtml | 4 ---- src/public/javascripts/application.js | 6 ++++-- 4 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 src/app/views/layouts/_popup-error.rhtml delete mode 100644 src/app/views/layouts/popup-error.rhtml diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 0044124..3ffaefe 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -86,7 +86,7 @@ class ApplicationController< ActionController::Base def html_error_page(title, msg, status) if request.xhr? - render :template => 'layouts/popup-error', :layout => 'popup', :status => status, + render :partial => 'layouts/popup-error', :status => status, :locals => {:title => title, :errmsg => msg} else render :template => 'layouts/error', :layout => 'application', diff --git a/src/app/views/layouts/_popup-error.rhtml b/src/app/views/layouts/_popup-error.rhtml new file mode 100644 index 0000000..094c13a --- /dev/null +++ b/src/app/views/layouts/_popup-error.rhtml @@ -0,0 +1,4 @@ +<%- content_for :title do -%> +<%= title %> +<%- end -%> +<%= errmsg %> diff --git a/src/app/views/layouts/popup-error.rhtml b/src/app/views/layouts/popup-error.rhtml deleted file mode 100644 index 094c13a..0000000 --- a/src/app/views/layouts/popup-error.rhtml +++ /dev/null @@ -1,4 +0,0 @@ -<%- content_for :title do -%> -<%= title %> -<%- end -%> -<%= errmsg %> diff --git a/src/public/javascripts/application.js b/src/public/javascripts/application.js index d2c262b..04fb4d3 100644 --- a/src/public/javascripts/application.js +++ b/src/public/javascripts/application.js @@ -20,8 +20,10 @@ $.extend(Conductor, { var url = $(this).attr('href'); $('#tab').html('<span class="loading_tabs"></span>'); $.get(url, function(data) { - $('#tab').html(data) - .show(); + $('#tab').html(data).show(); + }) + .error(function(data) { + $('#tab').html(data.responseText).show(); }); Conductor.tabRemoveActiveClass();

ACK to both patches.

Reply

4502

days inactive

4508

days old

aeolus-devel@lists.fedorahosted.org

Manage subscription

3 comments

2 participants

tags (0)

participants (2)

Imre Farkas
Tomas Sedovic