Metadata provider is IPA specific object, not a framework object, so it
should not be in _base directory.
https://fedorahosted.org/freeipa/ticket/3604
--
Petr Vobornik
From 144e68a2a849c7b5fd176359c03142dbb27e4d24 Mon Sep 17 00:00:00 2001
From: Petr Vobornik <pvobo...@redhat.com>
Date: Tue, 14 May 2013 19:21:02 +0200
Subject: [PATCH] Web UI: move ./_base/metadata_provider.js to ./metadata.js
Metadata provider is IPA specific object, not a framework object, so it should not be in _base directory.
https://fedorahosted.org/freeipa/ticket/3604
---
install/ui/src/freeipa/aci.js | 2 +-
install/ui/src/freeipa/association.js | 2 +-
install/ui/src/freeipa/automember.js | 2 +-
install/ui/src/freeipa/certificate.js | 2 +-
install/ui/src/freeipa/entity.js | 2 +-
install/ui/src/freeipa/field.js | 2 +-
install/ui/src/freeipa/hbactest.js | 2 +-
install/ui/src/freeipa/ipa.js | 2 +-
.../src/freeipa/{_base/metadata_provider.js => metadata.js} | 11 +++++++----
install/ui/src/freeipa/text.js | 2 +-
install/ui/test/aci_tests.js | 2 +-
install/ui/test/details_tests.js | 2 +-
12 files changed, 18 insertions(+), 15 deletions(-)
rename install/ui/src/freeipa/{_base/metadata_provider.js => metadata.js} (87%)
diff --git a/install/ui/src/freeipa/aci.js b/install/ui/src/freeipa/aci.js
index 20acca20e2f7a9a1c747aada0eee8e2dc10a2bf5..aa28d7218bfc47a13a16ab6282517651bf20cdc4 100644
--- a/install/ui/src/freeipa/aci.js
+++ b/install/ui/src/freeipa/aci.js
@@ -20,7 +20,7 @@
*/
define([
- './_base/metadata_provider',
+ './metadata',
'./ipa',
'./jquery',
'./phases',
diff --git a/install/ui/src/freeipa/association.js b/install/ui/src/freeipa/association.js
index fc073eb06380dee57403676fe2729c0af430d508..9ba66d448dfb8285cd11dc5b990f8a4c4a7047d5 100644
--- a/install/ui/src/freeipa/association.js
+++ b/install/ui/src/freeipa/association.js
@@ -24,7 +24,7 @@
define([
'dojo/Deferred',
- './_base/metadata_provider',
+ './metadata',
'./ipa',
'./jquery',
'./navigation',
diff --git a/install/ui/src/freeipa/automember.js b/install/ui/src/freeipa/automember.js
index 36793f3037c16d33942178c69b2f95ef55e76645..f8083b89e49ec270ed6170f9826ef4cd45e08865 100644
--- a/install/ui/src/freeipa/automember.js
+++ b/install/ui/src/freeipa/automember.js
@@ -19,7 +19,7 @@
*/
define([
- './_base/metadata_provider',
+ './metadata',
'./ipa',
'./jquery',
'./navigation',
diff --git a/install/ui/src/freeipa/certificate.js b/install/ui/src/freeipa/certificate.js
index e53b6ef6d9cc1d25ca890c7f5be6fb418c70c601..8979390871e5cd2b75a9deb8a5b79818a4131f18 100755
--- a/install/ui/src/freeipa/certificate.js
+++ b/install/ui/src/freeipa/certificate.js
@@ -21,7 +21,7 @@
define([
'dojo/_base/lang',
- './_base/metadata_provider',
+ './metadata',
'./ipa',
'./jquery',
'./menu',
diff --git a/install/ui/src/freeipa/entity.js b/install/ui/src/freeipa/entity.js
index 0d0564d1df8150146df67bfab361ccf8b7b6f547..1896f9077435654e6746a5d175eeeacc437ec5a3 100644
--- a/install/ui/src/freeipa/entity.js
+++ b/install/ui/src/freeipa/entity.js
@@ -23,7 +23,7 @@
define([
'dojo/_base/lang',
- './_base/metadata_provider',
+ './metadata',
'./_base/Singleton_registry',
'./builder',
'./ipa',
diff --git a/install/ui/src/freeipa/field.js b/install/ui/src/freeipa/field.js
index 17f440abaf0a5f87cc336009f35931f5e88b4c8e..087f6e28906afa12605b7abdf58a724c7046e59f 100644
--- a/install/ui/src/freeipa/field.js
+++ b/install/ui/src/freeipa/field.js
@@ -25,7 +25,7 @@
define([
'dojo/_base/array',
'dojo/_base/lang',
- './_base/metadata_provider',
+ './metadata',
'./builder',
'./ipa',
'./jquery',
diff --git a/install/ui/src/freeipa/hbactest.js b/install/ui/src/freeipa/hbactest.js
index 4eefe5635b3c0e9cbd523a9bc6053dfaabdda80d..c5189f9b38227219af835851214d9c23f802b612 100644
--- a/install/ui/src/freeipa/hbactest.js
+++ b/install/ui/src/freeipa/hbactest.js
@@ -19,7 +19,7 @@
*/
define([
- './_base/metadata_provider',
+ './metadata',
'./ipa',
'./jquery',
'./navigation',
diff --git a/install/ui/src/freeipa/ipa.js b/install/ui/src/freeipa/ipa.js
index 69d375a4b4e512ebb8cd86f048ea8a43a7cef858..441a9052e9e73038ae7344f5cc042c64e6b44d94 100644
--- a/install/ui/src/freeipa/ipa.js
+++ b/install/ui/src/freeipa/ipa.js
@@ -25,7 +25,7 @@
define(['./jquery',
'./json2',
'./_base/i18n',
- './_base/metadata_provider',
+ './metadata',
'./builder',
'./reg',
'./text'],
diff --git a/install/ui/src/freeipa/_base/metadata_provider.js b/install/ui/src/freeipa/metadata.js
similarity index 87%
rename from install/ui/src/freeipa/_base/metadata_provider.js
rename to install/ui/src/freeipa/metadata.js
index 9a332b55600bfe0189733987edf4e1aa50f6d72c..d33d3ae8fbfd151abd2c6faa5c3c5617366b0725 100644
--- a/install/ui/src/freeipa/_base/metadata_provider.js
+++ b/install/ui/src/freeipa/metadata.js
@@ -18,8 +18,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-define(['dojo/_base/lang', './Provider', './Search_provider'],
- function(lang, Provider, Search_provider) {
+define([
+ 'dojo/_base/lang',
+ './_base/Provider',
+ './_base/Search_provider'
+ ], function(lang, Provider, Search_provider) {
var metadata = new Provider({
code: '@m:'
@@ -29,7 +32,7 @@ define(['dojo/_base/lang', './Provider', './Search_provider'],
source: metadata,
path: 'objects'
});
- var commmads = new Provider({
+ var commands = new Provider({
code: '@mc:',
source: metadata,
path: 'commands'
@@ -56,7 +59,7 @@ define(['dojo/_base/lang', './Provider', './Search_provider'],
array_attr: 'name'
});
- metadata.providers.push(objects, commmads, object_param, cmd_arg, cmd_option);
+ metadata.providers.push(objects, commands, object_param, cmd_arg, cmd_option);
return metadata;
});
\ No newline at end of file
diff --git a/install/ui/src/freeipa/text.js b/install/ui/src/freeipa/text.js
index 1e5b0e591200d53be234cb3d1a2d4cb421c63e25..a439237ae3424407e1baba84fd03287f7e4bca11 100644
--- a/install/ui/src/freeipa/text.js
+++ b/install/ui/src/freeipa/text.js
@@ -24,7 +24,7 @@
* Serves for returning labels, titles, messages from various providers.
* Other providers can extends functionality.
*/
-define(['./_base/Provider', './_base/i18n', './_base/metadata_provider'],
+define(['./_base/Provider', './_base/i18n', './metadata'],
function(Provider, i18n, metadata) {
var text = new Provider({
diff --git a/install/ui/test/aci_tests.js b/install/ui/test/aci_tests.js
index a819d3f141dbfb56215b2a3eb34b2746539b2d74..b0464e7fdb43fba0b789fad86a54e2a6efb99413 100644
--- a/install/ui/test/aci_tests.js
+++ b/install/ui/test/aci_tests.js
@@ -19,7 +19,7 @@
*/
define([
- 'freeipa/_base/metadata_provider',
+ 'freeipa/metadata',
'freeipa/aci',
'freeipa/details',
'freeipa/facet',
diff --git a/install/ui/test/details_tests.js b/install/ui/test/details_tests.js
index 26bc4fb6649bd57de15cc4438c507bae0897cba4..85fb270fd73b9e0a3d1d1cc99df6930b49a1cd9d 100644
--- a/install/ui/test/details_tests.js
+++ b/install/ui/test/details_tests.js
@@ -19,7 +19,7 @@
*/
define([
- 'freeipa/_base/metadata_provider',
+ 'freeipa/metadata',
'freeipa/ipa',
'freeipa/jquery',
'freeipa/details',
--
1.8.1.4
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
