|
 |
9991ea |
From ff15df8bd58bddd4c53644867f8ee340febdc198 Mon Sep 17 00:00:00 2001
|
|
|
9991ea |
From: Petr Vobornik <pvoborni@redhat.com>
|
|
|
9991ea |
Date: Mon, 20 Jan 2014 09:50:56 +0100
|
|
|
9991ea |
Subject: [PATCH 33/34] Remove SID resolve call from Web UI
|
|
|
9991ea |
|
|
|
9991ea |
- it's called in group-show
|
|
|
9991ea |
|
|
|
9991ea |
https://bugzilla.redhat.com/show_bug.cgi?id=1054391
|
|
|
9991ea |
https://fedorahosted.org/freeipa/ticket/4123
|
|
|
9991ea |
---
|
|
|
9991ea |
install/ui/src/freeipa/association.js | 47 -----------------------------------
|
|
|
9991ea |
install/ui/src/freeipa/group.js | 1 -
|
|
|
9991ea |
2 files changed, 48 deletions(-)
|
|
|
9991ea |
|
|
|
9991ea |
diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js
|
|
|
9991ea |
index ad427d66b6b98119b2eb577ae98e4b7c2f1a6932..8d81e495a153c06cdbcfa9917bdf04d70916f997 100644
|
|
|
9991ea |
--- a/install/ui/src/freeipa/association.js
|
|
|
9991ea |
+++ b/install/ui/src/freeipa/association.js
|
|
|
9991ea |
@@ -1455,53 +1455,6 @@ exp.attribute_facet = IPA.attribute_facet = function(spec, no_init) {
|
|
|
9991ea |
return that;
|
|
|
9991ea |
};
|
|
|
9991ea |
|
|
|
9991ea |
-IPA.sid_facet = function(spec, no_init) {
|
|
|
9991ea |
-
|
|
|
9991ea |
- spec.name = spec.name || 'sid_facet';
|
|
|
9991ea |
-
|
|
|
9991ea |
- var that = IPA.attribute_facet(spec, no_init);
|
|
|
9991ea |
-
|
|
|
9991ea |
- that.load_records = function(value) {
|
|
|
9991ea |
- var xlate = {};
|
|
|
9991ea |
- var sidxlate_command = IPA.command({
|
|
|
9991ea |
- entity: 'trust',
|
|
|
9991ea |
- method: 'resolve',
|
|
|
9991ea |
- options: {
|
|
|
9991ea |
- sids: ''
|
|
|
9991ea |
- }
|
|
|
9991ea |
- });
|
|
|
9991ea |
- sidxlate_command.on_success = function(data, text_status, xhr) {
|
|
|
9991ea |
- for (var i=0; i< data.result.result.length; i++) {
|
|
|
9991ea |
- var entry = data.result.result[i];
|
|
|
9991ea |
- if (entry.sid[0] in xlate) {
|
|
|
9991ea |
- xlate[entry.sid[0]].resolve(entry.name[0]);
|
|
|
9991ea |
- }
|
|
|
9991ea |
- }
|
|
|
9991ea |
- };
|
|
|
9991ea |
- that.table.empty();
|
|
|
9991ea |
-
|
|
|
9991ea |
- if (value.length === 0) return;
|
|
|
9991ea |
-
|
|
|
9991ea |
- var sids = [];
|
|
|
9991ea |
- for (var i=0; i< value.length; i++) {
|
|
|
9991ea |
- var sid = value[i][that.attribute];
|
|
|
9991ea |
- var deferred = new Deferred();
|
|
|
9991ea |
- value[i][that.attribute] = {
|
|
|
9991ea |
- promise: deferred.promise,
|
|
|
9991ea |
- temp: sid
|
|
|
9991ea |
- };
|
|
|
9991ea |
- xlate[sid] = deferred;
|
|
|
9991ea |
- sids.push(sid);
|
|
|
9991ea |
- that.add_record(value[i]);
|
|
|
9991ea |
- }
|
|
|
9991ea |
- sidxlate_command.options.sids = sids;
|
|
|
9991ea |
- sidxlate_command.execute();
|
|
|
9991ea |
- };
|
|
|
9991ea |
-
|
|
|
9991ea |
- return that;
|
|
|
9991ea |
-};
|
|
|
9991ea |
-
|
|
|
9991ea |
-
|
|
|
9991ea |
IPA.attr_read_only_evaluator = function(spec) {
|
|
|
9991ea |
|
|
|
9991ea |
spec.name = spec.name || 'attr_read_only_evaluator';
|
|
|
9991ea |
diff --git a/install/ui/src/freeipa/group.js b/install/ui/src/freeipa/group.js
|
|
|
9991ea |
index 5e8cdf991cdaf4f52e3f49dca431e999a72f2089..bb12d902fcba8228098b667aa6fbd3fa7daee34d 100644
|
|
|
9991ea |
--- a/install/ui/src/freeipa/group.js
|
|
|
9991ea |
+++ b/install/ui/src/freeipa/group.js
|
|
|
9991ea |
@@ -112,7 +112,6 @@ return {
|
|
|
9991ea |
},
|
|
|
9991ea |
{
|
|
|
9991ea |
$type: 'attribute',
|
|
|
9991ea |
- $factory: IPA.sid_facet,
|
|
|
9991ea |
name: 'member_external',
|
|
|
9991ea |
attribute: 'ipaexternalmember',
|
|
|
9991ea |
tab_label: 'External',
|
|
|
9991ea |
--
|
|
|
9991ea |
1.8.4.2
|
|
|
9991ea |
|