Removal of IPA.metadata usages

https://fedorahosted.org/freeipa/ticket/3235

7 files changed, 31 insertions, 23 deletions

diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js
index 8bde8a0e2..20acca20e 100644
--- a/install/ui/src/freeipa/aci.js
+++ b/install/ui/src/freeipa/aci.js
@@ -20,6 +20,7 @@
  */
 
 define([
+    './_base/metadata_provider',
     './ipa',
     './jquery',
     './phases',
@@ -29,7 +30,7 @@ define([
     './search',
     './association',
     './entity'],
-        function(IPA, $, phases, reg, text) {
+        function(metadata_provider, IPA, $, phases, reg, text) {
 
 var exp = IPA.aci = {};
 
@@ -571,7 +572,7 @@ IPA.attributes_widget = function(spec) {
 
         if (!object_type || object_type === '') return;
 
-        var metadata = IPA.metadata.objects[object_type];
+        var metadata = metadata_provider.get('@mo:'+object_type);
         if (!metadata) return;
 
         var aciattrs = metadata.aciattrs;
@@ -702,7 +703,7 @@ IPA.permission_target_widget = function(spec) {
 
         for (var j=0; j<type_param.values.length; j++) {
             var type_name = type_param.values[j];
-            var type_label = IPA.metadata.objects[type_name].label_singular;
+            var type_label = metadata_provider.get('@mo:'+type_name+'.label_singular');
 
             that.type_select.options.push({
                 label: type_label,
diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js
index 997799e00..36793f303 100644
--- a/install/ui/src/freeipa/automember.js
+++ b/install/ui/src/freeipa/automember.js
@@ -19,6 +19,7 @@
  */
 
 define([
+    './_base/metadata_provider',
     './ipa',
     './jquery',
     './navigation',
@@ -29,7 +30,7 @@ define([
     './search',
     './association',
     './entity'],
-    function(IPA, $, navigation, phases, reg, text) {
+    function(metadata_provider, IPA, $, navigation, phases, reg, text) {
 
 var exp = IPA.automember = {};
 
@@ -119,10 +120,11 @@ return {
 exp.metadata_extension_pre_op = function(spec, context) {
     //HACK: Automember takes_params is missing a cn attribute. This hack
     //copies cn from mod command. Also it is set as pkey.
-    var pkey_attr = IPA.metadata.commands.automember_mod.takes_args[0];
+    var metadata = metadata_provider.source;
+    var pkey_attr = metadata.commands.automember_mod.takes_args[0];
     pkey_attr.primary_key = true;
-    IPA.metadata.objects.automember.takes_params.push(pkey_attr);
-    IPA.metadata.objects.automember.primary_key = pkey_attr.name;
+    metadata.objects.automember.takes_params.push(pkey_attr);
+    metadata.objects.automember.primary_key = pkey_attr.name;
     return spec;
 };
 
@@ -416,9 +418,9 @@ IPA.automember.get_condition_attributes = function(type) {
     var options = [];
 
     if (type === 'group') {
-        options = IPA.metadata.objects.user.aciattrs;
+        options = metadata_provider.get('@mo:user.aciattrs');
     } else if (type === 'hostgroup') {
-        options = IPA.metadata.objects.host.aciattrs;
+        options = metadata_provider.get('@mo:host.aciattrs');
     }
 
     var list_options = IPA.create_options(options);
diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js
index 611fb7c62..19f54e95a 100755
--- a/install/ui/src/freeipa/certificate.js
+++ b/install/ui/src/freeipa/certificate.js
@@ -21,6 +21,7 @@
 
 define([
     'dojo/_base/lang',
+    './_base/metadata_provider',
     './ipa',
     './jquery',
     './menu',
@@ -28,7 +29,7 @@ define([
     './reg',
     './text',
     './dialog'],
-        function(lang, IPA, $, menu, phases, reg, text) {
+        function(lang, metadata_provider, IPA, $, menu, phases, reg, text) {
 
 var exp = IPA.cert = {};
 
@@ -963,7 +964,8 @@ exp.create_cert_metadata = function() {
         return null;
     };
 
-    var cmd = IPA.metadata.commands['cert_find'];
+    var metadata = metadata_provider.source;
+    var cmd = metadata.commands.cert_find;
     var entity = lang.clone(cmd);
     entity.attribute_members = {};
     entity.label = text.get('@i18n:objects.cert.certificates');
@@ -1020,7 +1022,7 @@ exp.create_cert_metadata = function() {
                 text.get('@i18n:objects.cert.certificate'));
 
 
-    IPA.metadata.objects.cert = entity;
+    metadata.objects.cert = entity;
     return entity;
 };
 
diff --git a/install/ui/src/freeipa/entity.js b/install/ui/src/freeipa/entity.js
index e0e5182b0..f132f325c 100644
--- a/install/ui/src/freeipa/entity.js
+++ b/install/ui/src/freeipa/entity.js
@@ -23,6 +23,7 @@
 
 define([
         'dojo/_base/lang',
+        './_base/metadata_provider',
         './_base/Singleton_registry',
         './builder',
         './ipa',
@@ -31,7 +32,8 @@ define([
         './text',
         './facets',
         './facet'],
-    function(lang, Singleton_registry, builder, IPA, $, reg, text, facet_reg) {
+    function(lang, metadata_provider, Singleton_registry, builder,
+             IPA, $, reg, text, facet_reg) {
 
 var exp = {};
 
@@ -88,7 +90,7 @@ exp.entity = IPA.entity = function(spec) {
     };
 
     that.get_default_metadata = function() {
-        return IPA.metadata.objects[that.name];
+        return metadata_provider.get('@mo:'+that.name);
     };
 
     that.get_containing_entity = function() {
diff --git a/install/ui/src/freeipa/facet.js b/install/ui/src/freeipa/facet.js
index 1676acead..ab897bff3 100644
--- a/install/ui/src/freeipa/facet.js
+++ b/install/ui/src/freeipa/facet.js
@@ -28,6 +28,7 @@ define([
         'dojo/on',
         'dojo/Stateful',
         'dojo/Evented',
+        './_base/metadata_provider',
         './builder',
         './facets',
         './ipa',
@@ -40,7 +41,7 @@ define([
         './dialog',
         './field',
         './widget'
-       ], function(declare, lang, construct, on, Stateful, Evented,
+       ], function(declare, lang, construct, on, Stateful, Evented, metadata_provider,
                    builder, facets, IPA, $, navigation, phases, reg, su, text) {
 
 /**
@@ -1552,9 +1553,10 @@ exp.facet_preops = {
         spec.facet_group = spec.facet_group || spec.attribute_member;
 
         spec.label = spec.label || entity.metadata.label_singular;
+
         spec.tab_label = spec.tab_label ||
-            (IPA.metadata.objects[spec.other_entity] ?
-            IPA.metadata.objects[spec.other_entity].label : spec.other_entity);
+                        metadata_provider.get('@mo:'+spec.other_entity+'.label') ||
+                        spec.other_entity;
 
         if (has_indirect_attribute_member(spec)) {
 
diff --git a/install/ui/src/freeipa/hbactest.js b/install/ui/src/freeipa/hbactest.js
index 4fc47aab2..4eefe5635 100644
--- a/install/ui/src/freeipa/hbactest.js
+++ b/install/ui/src/freeipa/hbactest.js
@@ -19,6 +19,7 @@
  */
 
 define([
+        './_base/metadata_provider',
         './ipa',
         './jquery',
         './navigation',
@@ -30,7 +31,7 @@ define([
         './association',
         './entity',
         './hbac'],
-            function(IPA, $, navigation, phases, reg, text) {
+            function(metadata_provider, IPA, $, navigation, phases, reg, text) {
 
 var exp = {};
 
@@ -140,7 +141,7 @@ IPA.hbac.test_entity = function(spec) {
     that.label = text.get('@i18n:objects.hbactest.label');
 
     that.get_default_metadata = function() {
-        return IPA.metadata.commands[that.name];
+        return metadata_provider.get('@mc:'+that.name);
     };
 
     return that;
diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js
index 701ed2398..69d375a4b 100644
--- a/install/ui/src/freeipa/ipa.js
+++ b/install/ui/src/freeipa/ipa.js
@@ -48,8 +48,6 @@ var IPA = function() {
         processData: false
     };
 
-    that.metadata = {};
-    metadata_provider.source = that.metadata;
     that.messages = {};
     that.whoami = {};
 
@@ -186,7 +184,7 @@ var IPA = function() {
                 object: 'all'
             },
             on_success: function(data, text_status, xhr) {
-                that.metadata.objects = data.result.objects;
+                metadata_provider.source.objects = data.result.objects;
             }
         });
 
@@ -197,7 +195,7 @@ var IPA = function() {
                 command: 'all'
             },
             on_success: function(data, text_status, xhr) {
-                that.metadata.commands = data.result.commands;
+                metadata_provider.source.commands = data.result.commands;
             }
         });