summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2013-04-18 14:39:26 +0200
committerPetr Vobornik <pvoborni@redhat.com>2013-05-06 16:22:28 +0200
commitaba74aafe57479e3d94e7010f08907352596edb8 (patch)
tree6d544de2303f9418e31ae47f485c7cce8998534f
parent9255bb481edde95ffa7c89b237f43fe1e2afe30f (diff)
downloadfreeipa-aba74aafe57479e3d94e7010f08907352596edb8.tar.gz
freeipa-aba74aafe57479e3d94e7010f08907352596edb8.tar.xz
freeipa-aba74aafe57479e3d94e7010f08907352596edb8.zip
Builder: handle expected errors in post_ops
https://fedorahosted.org/freeipa/ticket/3235
-rw-r--r--install/ui/src/freeipa/_base/Builder.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/install/ui/src/freeipa/_base/Builder.js b/install/ui/src/freeipa/_base/Builder.js
index 4c542fc53..cddadb9f1 100644
--- a/install/ui/src/freeipa/_base/Builder.js
+++ b/install/ui/src/freeipa/_base/Builder.js
@@ -299,6 +299,11 @@ define(['dojo/_base/declare',
} else {
obj = new cs.ctor(cs.spec);
}
+
+ obj = this._run_post_ops(this.post_ops, obj, cs.spec, context);
+ if (cs.post_ops) {
+ obj = this._run_post_ops(cs.post_ops, obj, cs.spec, context);
+ }
} catch (e) {
if (e.expected) {
// expected exceptions thrown by builder just mean that
@@ -309,11 +314,6 @@ define(['dojo/_base/declare',
}
}
- obj = this._run_post_ops(this.post_ops, obj, cs.spec, context);
- if (cs.post_ops) {
- obj = this._run_post_ops(cs.post_ops, obj, cs.spec, context);
- }
-
return obj;
},