On 06/15/2011 11:28 AM, Adam Young wrote:
On 06/15/2011 11:24 AM, Adam Young wrote:
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
Removed extra whitespace
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
Facet can override what to do on error
From a779c30aeafe839bbfe3982151ffadd2ea03f336 Mon Sep 17 00:00:00 2001
From: Adam Young <ayo...@redhat.com>
Date: Wed, 15 Jun 2011 11:18:25 -0400
Subject: [PATCH] no redirect on search
https://fedorahosted.org/freeipa/ticket/1281
---
install/ui/entity.js | 13 +++++++++----
install/ui/search.js | 4 ++++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/install/ui/entity.js b/install/ui/entity.js
index de57df544995df8a1f8721dfc6c9ff4698ec4f19..3b16c6518253d24ae450d46937aecb5ab245d16f 100644
--- a/install/ui/entity.js
+++ b/install/ui/entity.js
@@ -130,8 +130,15 @@ IPA.facet = function (spec) {
return $('.content', that.container);
};
+ that.report_error = function(error_thrown){
+ var details = $('.details', that.container).empty();
+ details.append('<p>Error: '+error_thrown.name+'</p>');
+ details.append('<p>'+error_thrown.message+'</p>');
+ }
+
that.on_error = function(xhr, text_status, error_thrown) {
- if (that.entity.redirect_facet) {
+ if (that.entity.redirect_facet )
+ {
var current_entity = that.entity;
while (current_entity.containing_entity){
current_entity = current_entity.containing_entity;
@@ -141,9 +148,7 @@ IPA.facet = function (spec) {
that.entity.redirect_facet);
return;
}else{
- var details = $('.details', that.container).empty();
- details.append('<p>Error: '+error_thrown.name+'</p>');
- details.append('<p>'+error_thrown.message+'</p>');
+ that.report_error(error_thrown);
}
};
diff --git a/install/ui/search.js b/install/ui/search.js
index 8250e0a76baacbac9de4a27165157cb1ff29aee4..5a9b14f0528dcf08f70e877bc6df56bb84bd2edd 100644
--- a/install/ui/search.js
+++ b/install/ui/search.js
@@ -287,6 +287,10 @@ IPA.search_facet = function(spec) {
that.search_refresh(that.entity);
};
+ that.on_error = function(xhr, text_status, error_thrown) {
+ that.report_error(error_thrown);
+ };
+
that.search_refresh = function(entity){
$('input[type=checkbox]',that.table.thead).removeAttr("checked");
--
1.7.5.2
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
