Hi,

Please review the attached patch. Thanks!

All references to hbac in the UI have been replaced with hbacrule.
This is to match the hbacrule plugin. The test data and templates
have been renamed as well.

--
Endi S. Dewata
From 424c5ed23087c1d62d01036ea96852390e336884 Mon Sep 17 00:00:00 2001
From: Endi S. Dewata <edew...@redhat.com>
Date: Tue, 11 Jan 2011 20:31:09 +0700
Subject: [PATCH] Renamed hbac to hbacrule.

All references to hbac in the UI have been replaced with hbacrule.
This is to match the hbacrule plugin. The test data and templates
have been renamed as well.
---
 install/static/Makefile.am                         |    2 +-
 install/static/{hbac.js => hbacrule.js}            |   40 ++++++++++----------
 install/static/index.html                          |    2 +-
 install/static/layouts/default/Makefile.am         |   12 +++---
 ...stime.html => hbacrule-details-accesstime.html} |    0
 ...-general.html => hbacrule-details-general.html} |    0
 ...etails-host.html => hbacrule-details-host.html} |    0
 ...-service.html => hbacrule-details-service.html} |    0
 ...ehost.html => hbacrule-details-sourcehost.html} |    0
 ...etails-user.html => hbacrule-details-user.html} |    0
 .../test/data/{hbac_add.json => hbacrule_add.json} |    0
 ...ccesstime.json => hbacrule_add_accesstime.json} |    0
 .../{hbac_add_host.json => hbacrule_add_host.json} |    0
 ..._add_service.json => hbacrule_add_service.json} |    0
 ...ourcehost.json => hbacrule_add_sourcehost.json} |    0
 .../{hbac_add_user.json => hbacrule_add_user.json} |    0
 .../test/data/{hbac_del.json => hbacrule_del.json} |    0
 .../data/{hbac_find.json => hbacrule_find.json}    |    0
 .../test/data/{hbac_mod.json => hbacrule_mod.json} |    0
 ...sstime.json => hbacrule_remove_accesstime.json} |    0
 ..._remove_host.json => hbacrule_remove_host.json} |    0
 ...e_service.json => hbacrule_remove_service.json} |    0
 ...cehost.json => hbacrule_remove_sourcehost.json} |    0
 ..._remove_user.json => hbacrule_remove_user.json} |    0
 .../data/{hbac_show.json => hbacrule_show.json}    |    0
 install/static/test/data/ipa_init.json             |    8 ++--
 install/static/webui.js                            |    2 +-
 27 files changed, 33 insertions(+), 33 deletions(-)
 rename install/static/{hbac.js => hbacrule.js} (96%)
 rename install/static/layouts/default/{hbac-details-accesstime.html => hbacrule-details-accesstime.html} (100%)
 rename install/static/layouts/default/{hbac-details-general.html => hbacrule-details-general.html} (100%)
 rename install/static/layouts/default/{hbac-details-host.html => hbacrule-details-host.html} (100%)
 rename install/static/layouts/default/{hbac-details-service.html => hbacrule-details-service.html} (100%)
 rename install/static/layouts/default/{hbac-details-sourcehost.html => hbacrule-details-sourcehost.html} (100%)
 rename install/static/layouts/default/{hbac-details-user.html => hbacrule-details-user.html} (100%)
 rename install/static/test/data/{hbac_add.json => hbacrule_add.json} (100%)
 rename install/static/test/data/{hbac_add_accesstime.json => hbacrule_add_accesstime.json} (100%)
 rename install/static/test/data/{hbac_add_host.json => hbacrule_add_host.json} (100%)
 rename install/static/test/data/{hbac_add_service.json => hbacrule_add_service.json} (100%)
 rename install/static/test/data/{hbac_add_sourcehost.json => hbacrule_add_sourcehost.json} (100%)
 rename install/static/test/data/{hbac_add_user.json => hbacrule_add_user.json} (100%)
 rename install/static/test/data/{hbac_del.json => hbacrule_del.json} (100%)
 rename install/static/test/data/{hbac_find.json => hbacrule_find.json} (100%)
 rename install/static/test/data/{hbac_mod.json => hbacrule_mod.json} (100%)
 rename install/static/test/data/{hbac_remove_accesstime.json => hbacrule_remove_accesstime.json} (100%)
 rename install/static/test/data/{hbac_remove_host.json => hbacrule_remove_host.json} (100%)
 rename install/static/test/data/{hbac_remove_service.json => hbacrule_remove_service.json} (100%)
 rename install/static/test/data/{hbac_remove_sourcehost.json => hbacrule_remove_sourcehost.json} (100%)
 rename install/static/test/data/{hbac_remove_user.json => hbacrule_remove_user.json} (100%)
 rename install/static/test/data/{hbac_show.json => hbacrule_show.json} (100%)

diff --git a/install/static/Makefile.am b/install/static/Makefile.am
index 5c88d7800aaf4e695b7283aea057d88a9e347e21..a539eb8bc399c9149686b88858de6e04b7ed02f1 100644
--- a/install/static/Makefile.am
+++ b/install/static/Makefile.am
@@ -21,7 +21,7 @@ app_DATA =                              \
 	jquery-ui.css			\
 	certificate.js 			\
 	group.js 			\
-	hbac.js 			\
+	hbacrule.js 			\
 	hbacsvc.js 			\
 	hbacsvcgroup.js 		\
 	host.js 			\
diff --git a/install/static/hbac.js b/install/static/hbacrule.js
similarity index 96%
rename from install/static/hbac.js
rename to install/static/hbacrule.js
index 264b7c5ae0461061c5f2b5b6ef8514eafb0db076..0e6d82ccd2ef17e1fd6f3aaa072a1e67501372e2 100755
--- a/install/static/hbac.js
+++ b/install/static/hbacrule.js
@@ -20,28 +20,28 @@
 
 /* REQUIRES: ipa.js, details.js, search.js, add.js, entity.js */
 
-function ipa_hbac() {
+function ipa_hbacrule() {
 
     var that = ipa_entity({
-        'name': 'hbac'
+        'name': 'hbacrule'
     });
 
     that.init = function() {
 
-        var dialog = ipa_hbac_add_dialog({
+        var dialog = ipa_hbacrule_add_dialog({
             'name': 'add',
             'title': 'Add New Rule'
         });
         that.add_dialog(dialog);
         dialog.init();
 
-        var facet = ipa_hbac_search_facet({
+        var facet = ipa_hbacrule_search_facet({
             'name': 'search',
             'label': 'Search'
         });
         that.add_facet(facet);
 
-        facet = ipa_hbac_details_facet({
+        facet = ipa_hbacrule_details_facet({
             'name': 'details',
             'label': 'Details'
         });
@@ -53,9 +53,9 @@ function ipa_hbac() {
     return that;
 }
 
-IPA.add_entity(ipa_hbac());
+IPA.add_entity(ipa_hbacrule());
 
-function ipa_hbac_add_dialog(spec) {
+function ipa_hbacrule_add_dialog(spec) {
 
     spec = spec || {};
 
@@ -83,7 +83,7 @@ function ipa_hbac_add_dialog(spec) {
     return that;
 }
 
-function ipa_hbac_search_facet(spec) {
+function ipa_hbacrule_search_facet(spec) {
 
     spec = spec || {};
 
@@ -126,7 +126,7 @@ function ipa_hbac_search_facet(spec) {
     return that;
 }
 
-function ipa_hbac_details_facet(spec) {
+function ipa_hbacrule_details_facet(spec) {
 
     spec = spec || {};
 
@@ -140,11 +140,11 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'general',
                 'label': 'General',
-                'template': 'hbac-details-general.html #contents'
+                'template': 'hbacrule-details-general.html #contents'
             });
 
         } else {
-            section = ipa_hbac_details_general_section({
+            section = ipa_hbacrule_details_general_section({
                 'name': 'general',
                 'label': 'General'
             });
@@ -160,7 +160,7 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'user',
                 'label': 'Who',
-                'template': 'hbac-details-user.html #contents'
+                'template': 'hbacrule-details-user.html #contents'
             });
 
         } else {
@@ -197,7 +197,7 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'host',
                 'label': 'Accessing',
-                'template': 'hbac-details-host.html #contents'
+                'template': 'hbacrule-details-host.html #contents'
             });
 
         } else {
@@ -234,7 +234,7 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'service',
                 'label': 'Via Service',
-                'template': 'hbac-details-service.html #contents'
+                'template': 'hbacrule-details-service.html #contents'
             });
 
         } else {
@@ -271,7 +271,7 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'sourcehost',
                 'label': 'From',
-                'template': 'hbac-details-sourcehost.html #contents'
+                'template': 'hbacrule-details-sourcehost.html #contents'
             });
 
         } else {
@@ -308,7 +308,7 @@ function ipa_hbac_details_facet(spec) {
             section = that.create_section({
                 'name': 'accesstime',
                 'label': 'When',
-                'template': 'hbac-details-accesstime.html #contents'
+                'template': 'hbacrule-details-accesstime.html #contents'
             });
 
         } else {
@@ -318,7 +318,7 @@ function ipa_hbac_details_facet(spec) {
             });
         }
 
-        section.add_field(ipa_hbac_accesstime_widget({
+        section.add_field(ipa_hbacrule_accesstime_widget({
             'id': 'accesstime',
             'name': 'accesstime', 'label': 'Access Time',
             'text': 'Rule applies when access is being requested at:',
@@ -523,7 +523,7 @@ function ipa_hbac_details_facet(spec) {
             return;
         }
 
-        //alert(JSON.stringify(batch.to_json()));
+        alert(JSON.stringify(batch.to_json()));
 
         batch.execute();
     };
@@ -538,7 +538,7 @@ function ipa_hbac_details_facet(spec) {
     return that;
 }
 
-function ipa_hbac_details_general_section(spec){
+function ipa_hbacrule_details_general_section(spec){
 
     spec = spec || {};
 
@@ -679,7 +679,7 @@ function ipa_hbac_details_general_section(spec){
     return that;
 }
 
-function ipa_hbac_accesstime_widget(spec) {
+function ipa_hbacrule_accesstime_widget(spec) {
 
     spec = spec || {};
 
diff --git a/install/static/index.html b/install/static/index.html
index 9a62470f982501aa9d11be34a0a70ea5cd58ba2f..d63bfc106abe45432f62fd103271e0d9ba61f3c6 100644
--- a/install/static/index.html
+++ b/install/static/index.html
@@ -23,7 +23,7 @@
     <script type="text/javascript" src="certificate.js"></script>
     <script type="text/javascript" src="user.js"></script>
     <script type="text/javascript" src="group.js"></script>
-    <script type="text/javascript" src="hbac.js"></script>
+    <script type="text/javascript" src="hbacrule.js"></script>
     <script type="text/javascript" src="hbacsvc.js"></script>
     <script type="text/javascript" src="hbacsvcgroup.js"></script>
     <script type="text/javascript" src="host.js"></script>
diff --git a/install/static/layouts/default/Makefile.am b/install/static/layouts/default/Makefile.am
index ca57a653975b57b0bd57126ec04544cf6bec982c..b02c1c504b10cc77e4ff11347c39ac61975776eb 100644
--- a/install/static/layouts/default/Makefile.am
+++ b/install/static/layouts/default/Makefile.am
@@ -7,12 +7,12 @@ SUBDIRS =  				\
 
 appdir = $(IPA_DATA_DIR)/static/layouts/default
 app_DATA =                              \
-	hbac-details-accesstime.html	\
-	hbac-details-general.html	\
-	hbac-details-host.html		\
-	hbac-details-service.html	\
-	hbac-details-sourcehost.html	\
-	hbac-details-user.html		\
+	hbacrule-details-accesstime.html	\
+	hbacrule-details-general.html	\
+	hbacrule-details-host.html		\
+	hbacrule-details-service.html	\
+	hbacrule-details-sourcehost.html	\
+	hbacrule-details-user.html		\
 	sudorule-details-general.html	\
 	sudorule-group-dialog.html	\
 	sudorule-host-dialog.html	\
diff --git a/install/static/layouts/default/hbac-details-accesstime.html b/install/static/layouts/default/hbacrule-details-accesstime.html
similarity index 100%
rename from install/static/layouts/default/hbac-details-accesstime.html
rename to install/static/layouts/default/hbacrule-details-accesstime.html
diff --git a/install/static/layouts/default/hbac-details-general.html b/install/static/layouts/default/hbacrule-details-general.html
similarity index 100%
rename from install/static/layouts/default/hbac-details-general.html
rename to install/static/layouts/default/hbacrule-details-general.html
diff --git a/install/static/layouts/default/hbac-details-host.html b/install/static/layouts/default/hbacrule-details-host.html
similarity index 100%
rename from install/static/layouts/default/hbac-details-host.html
rename to install/static/layouts/default/hbacrule-details-host.html
diff --git a/install/static/layouts/default/hbac-details-service.html b/install/static/layouts/default/hbacrule-details-service.html
similarity index 100%
rename from install/static/layouts/default/hbac-details-service.html
rename to install/static/layouts/default/hbacrule-details-service.html
diff --git a/install/static/layouts/default/hbac-details-sourcehost.html b/install/static/layouts/default/hbacrule-details-sourcehost.html
similarity index 100%
rename from install/static/layouts/default/hbac-details-sourcehost.html
rename to install/static/layouts/default/hbacrule-details-sourcehost.html
diff --git a/install/static/layouts/default/hbac-details-user.html b/install/static/layouts/default/hbacrule-details-user.html
similarity index 100%
rename from install/static/layouts/default/hbac-details-user.html
rename to install/static/layouts/default/hbacrule-details-user.html
diff --git a/install/static/test/data/hbac_add.json b/install/static/test/data/hbacrule_add.json
similarity index 100%
rename from install/static/test/data/hbac_add.json
rename to install/static/test/data/hbacrule_add.json
diff --git a/install/static/test/data/hbac_add_accesstime.json b/install/static/test/data/hbacrule_add_accesstime.json
similarity index 100%
rename from install/static/test/data/hbac_add_accesstime.json
rename to install/static/test/data/hbacrule_add_accesstime.json
diff --git a/install/static/test/data/hbac_add_host.json b/install/static/test/data/hbacrule_add_host.json
similarity index 100%
rename from install/static/test/data/hbac_add_host.json
rename to install/static/test/data/hbacrule_add_host.json
diff --git a/install/static/test/data/hbac_add_service.json b/install/static/test/data/hbacrule_add_service.json
similarity index 100%
rename from install/static/test/data/hbac_add_service.json
rename to install/static/test/data/hbacrule_add_service.json
diff --git a/install/static/test/data/hbac_add_sourcehost.json b/install/static/test/data/hbacrule_add_sourcehost.json
similarity index 100%
rename from install/static/test/data/hbac_add_sourcehost.json
rename to install/static/test/data/hbacrule_add_sourcehost.json
diff --git a/install/static/test/data/hbac_add_user.json b/install/static/test/data/hbacrule_add_user.json
similarity index 100%
rename from install/static/test/data/hbac_add_user.json
rename to install/static/test/data/hbacrule_add_user.json
diff --git a/install/static/test/data/hbac_del.json b/install/static/test/data/hbacrule_del.json
similarity index 100%
rename from install/static/test/data/hbac_del.json
rename to install/static/test/data/hbacrule_del.json
diff --git a/install/static/test/data/hbac_find.json b/install/static/test/data/hbacrule_find.json
similarity index 100%
rename from install/static/test/data/hbac_find.json
rename to install/static/test/data/hbacrule_find.json
diff --git a/install/static/test/data/hbac_mod.json b/install/static/test/data/hbacrule_mod.json
similarity index 100%
rename from install/static/test/data/hbac_mod.json
rename to install/static/test/data/hbacrule_mod.json
diff --git a/install/static/test/data/hbac_remove_accesstime.json b/install/static/test/data/hbacrule_remove_accesstime.json
similarity index 100%
rename from install/static/test/data/hbac_remove_accesstime.json
rename to install/static/test/data/hbacrule_remove_accesstime.json
diff --git a/install/static/test/data/hbac_remove_host.json b/install/static/test/data/hbacrule_remove_host.json
similarity index 100%
rename from install/static/test/data/hbac_remove_host.json
rename to install/static/test/data/hbacrule_remove_host.json
diff --git a/install/static/test/data/hbac_remove_service.json b/install/static/test/data/hbacrule_remove_service.json
similarity index 100%
rename from install/static/test/data/hbac_remove_service.json
rename to install/static/test/data/hbacrule_remove_service.json
diff --git a/install/static/test/data/hbac_remove_sourcehost.json b/install/static/test/data/hbacrule_remove_sourcehost.json
similarity index 100%
rename from install/static/test/data/hbac_remove_sourcehost.json
rename to install/static/test/data/hbacrule_remove_sourcehost.json
diff --git a/install/static/test/data/hbac_remove_user.json b/install/static/test/data/hbacrule_remove_user.json
similarity index 100%
rename from install/static/test/data/hbac_remove_user.json
rename to install/static/test/data/hbacrule_remove_user.json
diff --git a/install/static/test/data/hbac_show.json b/install/static/test/data/hbacrule_show.json
similarity index 100%
rename from install/static/test/data/hbac_show.json
rename to install/static/test/data/hbacrule_show.json
diff --git a/install/static/test/data/ipa_init.json b/install/static/test/data/ipa_init.json
index e399d8081a1d58121562a5b204a15e57706485fd..3b3f2db7d1068e31f01b3a378db524a3f8cba307 100644
--- a/install/static/test/data/ipa_init.json
+++ b/install/static/test/data/ipa_init.json
@@ -3132,7 +3132,7 @@
                         ],
                         "uuid_attribute": "ipauniqueid"
                     },
-                    "hbac": {
+                    "hbacrule": {
                         "aciattrs": [
                             "accessruletype",
                             "accesstime",
@@ -3169,7 +3169,7 @@
                             ]
                         },
                         "bindable": false,
-                        "container_dn": "cn=hbac",
+                        "container_dn": "cn=hbacrules",
                         "default_attributes": [
                             "cn",
                             "accessruletype",
@@ -3208,7 +3208,7 @@
                             "remove_user",
                             "show"
                         ],
-                        "name": "hbac",
+                        "name": "hbacrule",
                         "object_class": [
                             "ipaassociation",
                             "ipahbacrule"
@@ -7833,7 +7833,7 @@
                     "container_configs": "cn=configs,cn=policies",
                     "container_dns": "cn=dns",
                     "container_group": "cn=groups,cn=accounts",
-                    "container_hbac": "cn=hbac",
+                    "container_hbacrule": "cn=hbacrules",
                     "container_hbacservice": "cn=hbacservices,cn=accounts",
                     "container_hbacservicegroup": "cn=hbacservicegroups,cn=accounts",
                     "container_host": "cn=computers,cn=accounts",
diff --git a/install/static/webui.js b/install/static/webui.js
index f17db8bc92de43684923cae3ad78f46aa81749b4..964c8cf79fc9ac5a35b3cc7271a0f70283196048 100644
--- a/install/static/webui.js
+++ b/install/static/webui.js
@@ -34,7 +34,7 @@ var admin_tab_set = [
     ]},
     {name:'policy', children:[
         {name:'dnszone', entity:'dnszone'},
-        {name:'hbac', entity:'hbac', children:[
+        {name:'hbacrule', entity:'hbacrule', children:[
             {name:'hbacsvc', entity:'hbacsvc'},
             {name:'hbacsvcgroup', entity:'hbacsvcgroup'}
         ]},
-- 
1.6.6.1

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to