On 7/21/2011 9:47 AM, Adam Young wrote:
Close to ACK, but:
Either remove all of the references to the field, or comment them out.
Suggest going the commented out route. Also, leave the commas inside the
commented out code, so that you can just remove the comment and the code
will be valid, even if it needs to be reformatted.


New patch attached.

--
Endi S. Dewata
From 25f11e843535eb3f4162e4abf80d7f80ff930c1d Mon Sep 17 00:00:00 2001
From: Endi S. Dewata <edew...@redhat.com>
Date: Wed, 20 Jul 2011 22:31:37 -0500
Subject: [PATCH] Removed entitlement registration UUID field.

The UUID field has been removed from the entitlement registration
dialog box because it's currently not supported. The code has been
modified not to send empty UUID value should this become supported
in the future.

Ticket #1506
---
 install/ui/entitle.js |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/install/ui/entitle.js b/install/ui/entitle.js
index b3b09e562f078be33e8a4a0913bc8d1f4b8cfdcd..bbcf2395c5e5901c3311678e0fd66e18b4cb10da 100644
--- a/install/ui/entitle.js
+++ b/install/ui/entitle.js
@@ -131,12 +131,14 @@ IPA.entity_factories.entitle = function() {
                     label: IPA.get_method_option('entitle_register', 'password').label,
                     type: 'password',
                     undo: false
-                },
-                {
+                }
+/* currently not supported
+                , {
                     name: 'ipaentitlementid',
                     label: IPA.get_method_option('entitle_register', 'ipaentitlementid').label,
                     undo: false
                 }
+*/
             ]
         }).
         dialog({
@@ -254,8 +256,7 @@ IPA.entitle.entity = function(spec) {
             method: 'register',
             args: [ username ],
             options: {
-                password: password,
-                ipaentitlementid: ipaentitlementid
+                password: password
             },
             on_success: function(data, text_status, xhr) {
                 that.status = IPA.entitle.online;
@@ -266,6 +267,10 @@ IPA.entitle.entity = function(spec) {
             on_error: on_error
         });
 
+        if (ipaentitlementid) {
+            command.set_option('ipaentitlementid', ipaentitlementid);
+        }
+
         command.execute();
     };
 
-- 
1.7.5.1

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

Reply via email to