Restoring Services tab.

The add.js has been modified to support adding new entry with
dynamically generated pkey.

The index.xhtml has been modified to include service.js.

The service.js has been modified to use the new API to define
the search, add, and details fields. Callbacks are used to
add quick links and generate pkey dynamically.

The webui.js has been modified to add the Services tab.

install/static/add.js

@@ -28,21 +28,19 @@ function add_dialog_create(obj_name, adl)
     var add_dialog = $('<div></div>');
 
     function add(evt, called_from_add_and_edit) {
+        var pkey = [];
+        var options = {};
+        var pkey_name = ipa_objs[obj_name].primary_key;
+
         function add_win(data, text_status, xhr) {
             if (called_from_add_and_edit) {
                 var state = {};
                 state[obj_name + '-facet'] = 'details';
-                var pkey_name = ipa_objs[obj_name].primary_key;
-                var selector = 'input[name=' + pkey_name + ']';
-                state[obj_name + '-pkey'] = add_dialog.find(selector).val();
+                state[obj_name + '-pkey'] = pkey[0];
                 $.bbq.pushState(state);
             }
         };
 
-        var pkey = [];
-        var options = {};
-        var pkey_name = ipa_objs[obj_name].primary_key;
-
         var fields = adl[2];
         for (var i = 0; i < fields.length; ++i) {
             var f = fields[i];

install/static/index.xhtml

@@ -24,6 +24,7 @@
     <script type="text/javascript" src="host.js"></script>
     <script type="text/javascript" src="hostgroup.js"></script>
     <script type="text/javascript" src="netgroup.js"></script>
+    <script type="text/javascript" src="service.js"></script>
 
     <script type="text/javascript" src="develop.js"></script>
     <script type="text/javascript" src="webui.js"></script>

install/static/service.js

@@ -1,93 +1,80 @@
-function setupService(facet) {
-    serviceForms.setup(facet);
-}
+/*  Authors:
+ *    Endi Sukma Dewata <edewata@redhat.com>
+ *
+ * Copyright (C) 2010 Red Hat
+ * see file 'COPYING' for use and warranty information
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 only
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
 
-var serviceForms = new ServiceForms();
+/* REQUIRES: ipa.js, details.js, search.js, add.js, entity.js */
 
-function ServiceForms() {
+ipa_entity_set_search_definition('service', [
+    ['krbprincipalname', 'Principal', null],
+    ['quick_links', 'Quick Links', service_render_quick_links]
+]);
 
-    this.obj = "service";
+ipa_entity_set_add_definition('service', [
+    'dialog-add-service', 'Add New Service', [
+        ['krbprincipalname', 'Principal', service_add_krbprincipalname],
+        ['service', 'Service', null],
+        ['host', 'Host Name', null],
+    ]
+]);
 
-    this.facets = ['details', 'hosts', 'assignhosts'];
-
-    this.setup = function(facet) {
-        if (this[facet]) {
-            this[facet].setup();
-        } else {
-            this.unspecified.setup();
-        }
-    };
-
-    this.hostListColumns = [ {title:"host",column:"managedby_host"} ];
-
-    this.hosts = new AssociationList(
-        this.obj,
-        "hosts",
-        "assignhosts",
-        this.hostListColumns,
-        this.facets
-    );
-
-    this.assignhosts = new AssociationForm(
-        this.obj,
-        "host",
-        "assignhosts",
-        this.facets,
-        "fqdn",
-        function() {
-            return 'Add Hosts to service : ' + qs['pkey'];
-        },
-        BulkAssociator,
-        "add_host"
-    );
-
-    this.detailsList = [
+ipa_entity_set_details_definition('service', [
     ['identity', 'Service Details', [
-            ['krbprincipalname', 'Kerberos Principal']
+        ['krbprincipalname', 'Principal', null],
     ]]
-    ];
+]);
 
-    this.details = new DetailsForm(
-        "service",
-        this.detailsList,
-        "krbprincipalname",
-        this.facets
-    );
+function service_render_quick_links(tr, attr, value, entry_attrs) {
 
-    this.addProperties = [
-        {title: 'Service', id: 'service', type: 'text'},
-        {title: 'Host Name', id: 'host', type: 'text'}
-    ];
+    var td = $("<td/>");
+    tr.append(td);
 
-    this.add = new EntityBuilder(
-        "service",
-        this.addProperties
-    );
+    $("<a/>", {
+        href: "jslink",
+        html: "[D]",
+        click: function() {
+            var state = {};
+            state['service-facet'] = 'details';
+            state['service-pkey'] = entry_attrs['krbprincipalname'][0];
+            $.bbq.pushState(state);
+            return false;
+        }
+    }).appendTo(td);
 
-    this.add.getPKey = function() {
-        return $("#service").val()+"/"+$("#host").val();
+    $("<a/>", {
+        href: "jslink",
+        html: "[G]",
+        click: function() {
+            var state = {};
+            state['service-facet'] = 'associate';
+            state['service-enroll'] = 'host';
+            state['service-pkey'] = entry_attrs['krbprincipalname'][0];
+            $.bbq.pushState(state);
+            return false;
+        }
+    }).appendTo(td);
 }
 
-    this.searchColumns = [
-        {
-            title: "Service",
-            column: "krbprincipalname",
-            render: function (current, cell) {
-                renderPkeyColumn2('service', 'krbprincipalname', current, cell);
+function service_add_krbprincipalname(add_dialog, flag) {
+    if (flag == IPA_ADD_UPDATE) {
+        var service = add_dialog.find('input[name=service]').val();
+        var host = add_dialog.find('input[name=host]').val();
+        return service+'/'+host;
     }
-        },
-        {
-            title: "Has Keytab",
-            column: "has_keytab",
-            render: renderSimpleColumn
-        }
-    ];
-
-    this.search = new SearchForm(
-        "service",
-        "find",
-        this.searchColumns
-    );
-
-    this.unspecified = this.search;
+    return null;
 }

install/static/webui.js

@@ -28,6 +28,7 @@ var nav_tabs_lists = [
         ['host', 'Hosts', ipa_entity_setup],
         ['hostgroup', 'Hostgroups', ipa_entity_setup],
         ['netgroup', 'Netgroups', ipa_entity_setup],
+        ['service', 'Services', ipa_entity_setup],
     ]],
     ['policy', 'POLICY', unimplemented_tab],
     ['config', 'CONFIG', unimplemented_tab]