[prev in list] [next in list] [prev in thread] [next in thread] 

List:       luci-commits
Subject:    [Luci-commits] [luci] Fix rhbz#636300: Egenera fence a. username spec.
From:       jpokorny () fedoraproject ! org (Jan Pokorny)
Date:       2010-09-23 18:50:37
Message-ID: 20100923185037.86A27120301 () lists ! fedorahosted ! org
[Download RAW message or body]

commit 738f497047396f1f881eafeace30f7b9d9368fd9
Author: Jan Pokorny <jpokorny at redhat.com>
Date:   Thu Sep 23 20:47:40 2010 +0200

    Fix rhbz#636300: Egenera fence a. username spec.

 luci/templates/fence_devices.html        |    4 ++--
 luci/templates/fence_instances.html      |    9 +--------
 luci/widget_validators/validate_fence.py |    8 +++-----
 3 files changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/luci/templates/fence_devices.html b/luci/templates/fence_devices.html
index af2c002..25ec536 100644
--- a/luci/templates/fence_devices.html
+++ b/luci/templates/fence_devices.html
@@ -616,8 +616,8 @@
 		<tr>
 			<td>Username</td>
 			<td>
-				<input name="username" type="text" class="text"
-					py:attrs="cur_fencedev and {'value': cur_fencedev.getAttribute('username')} or \
{}" /> +				<input name="user" type="text" class="text"
+					py:attrs="cur_fencedev and {'value': cur_fencedev.getAttribute('user')} or {}" \
/>  </td>
 		</tr>
 	</table>
diff --git a/luci/templates/fence_instances.html \
b/luci/templates/fence_instances.html index f785f53..5b90767 100644
--- a/luci/templates/fence_instances.html
+++ b/luci/templates/fence_instances.html
@@ -49,7 +49,7 @@
 			</div>
 		</td></tr>
 	</table>
-		
+
 	<input type="hidden" name="fence_type" value="fence_apc" />
 	<input type="hidden" name="fence_instance" value="1" />
 	<input type="hidden" name="parent_fencedev"
@@ -73,13 +73,6 @@
 					py:attrs="cur_fence_inst and {'value': \
cur_fence_inst.getAttribute('pserver')}"/>  </td>
 		</tr>
-		<tr>
-			<td>Username</td>
-			<td>
-				<input name="username" type="text" class="text"
-					py:attrs="cur_fence_inst and {'value': cur_fence_inst.getAttribute('username')} \
                or {'value': 'root'}"/>
-			</td>
-		</tr>
 		<tr><td colspan="2">
 			<div>
 				<input type="button" name="remove_fence" value="Remove this instance"
diff --git a/luci/widget_validators/validate_fence.py \
b/luci/widget_validators/validate_fence.py index 3d9516f..5d19209 100644
--- a/luci/widget_validators/validate_fence.py
+++ b/luci/widget_validators/validate_fence.py
@@ -178,7 +178,7 @@ def val_egenera_fd(fencedev, fence_name, **kw):
 	params = (
 		('cserver', True),
 		('esh', False),
-		('username', False),
+		('user', False),
 	)
 
 	errors = config_fence_attr(params, fencedev, fence_name, **kw)
@@ -744,9 +744,8 @@ def val_egenera_fi(fenceinst, parent_name, **kw):
 	params = (
 		('lpan', True),
 		('pserver', True),
-		('username', False),
 	)
-	
+
 	errors = config_fence_attr(params, fenceinst, parent_name, **kw)
 	return errors
 
@@ -757,10 +756,9 @@ def val_lpar_fi(fenceinst, parent_name, **kw):
 		('secure', True),
 		('identity_file', False),
 	)
-	
+
 	errors = config_fence_attr(params, fenceinst, parent_name, **kw)
 	return errors
-	
 
 def val_bullpap_fi(fenceinst, parent_name, **kw):
 	params = (


[prev in list] [next in list] [prev in thread] [next in thread]