CVSROOT: /cvs/cluster Module name: conga Branch: RHEL5 Changes by: [EMAIL PROTECTED] 2008-07-15 18:20:02
Modified files:
. : conga.spec.in.in
luci/site/luci/Extensions: StorageReport.py
luci/storage : form-macros
Log message:
fix bz414551
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.96&r2=1.45.2.97
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/StorageReport.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.20.2.8&r2=1.20.2.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17.2.13&r2=1.17.2.14
--- conga/conga.spec.in.in 2008/07/14 22:21:45 1.45.2.96
+++ conga/conga.spec.in.in 2008/07/15 18:19:58 1.45.2.97
@@ -305,6 +305,7 @@
- Fix bz441581 (Don't allow both label and device for qdisk config if only one
can be specified)
- Fix bz223785 (Storage 'Display Devices by' option does not work)
- Fix bz250439 (conga is unable to delete snapshot volumes)
+- Fix bz414551 (Sector size list is improperly sorted)
* Fri Apr 18 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-8
- Fix bz441580 (conga should install 'sg3_utils' and start service
'scsi_reserve' when scsi fencing is used)
--- conga/luci/site/luci/Extensions/StorageReport.py 2008/04/14 15:58:35
1.20.2.8
+++ conga/luci/site/luci/Extensions/StorageReport.py 2008/07/15 18:19:58
1.20.2.9
@@ -1621,9 +1621,10 @@
mutable = var.getAttribute('mutable') == 'true'
var_type = var.getAttribute('type')
value = var.getAttribute('value')
+ def_value = value
d_units = ''
- if name in ('size', 'extent_size', 'block_size', 'size_free',
'partition_begin' ):
+ if name in ('size', 'extent_size', 'block_size',
'journal_size', 'size_free', 'partition_begin' ):
d_units = 'bytes'
if 'percent' in name:
d_units = '%'
@@ -1697,6 +1698,7 @@
'name': name,
'pretty_name': get_pretty_prop_name(name),
'type': d_type,
+ 'default_val': def_value,
'value': d_value,
'units': d_units,
'validation': validation_data,
--- conga/luci/storage/form-macros 2008/07/14 21:59:09 1.17.2.13
+++ conga/luci/storage/form-macros 2008/07/15 18:19:59 1.17.2.14
@@ -867,21 +867,28 @@
<tal:block
tal:condition="python:prop_type == 'select'">
<select
tal:define="prop_options prop/value" tal:attributes="name p">
-
<tal:block
-
tal:condition="python: prop_units != 'bytes'"
-
tal:repeat="prop_opt prop_options">
-
<option tal:attributes="value prop_opt" />
-
<span tal:replace="prop_opt" />
+
<tal:block tal:condition="python: prop_units != 'bytes'">
+
<tal:block tal:repeat="prop_opt prop_options">
+
<option tal:attributes="value prop_opt" />
+
<span tal:replace="prop_opt" />
+
</tal:block>
</tal:block>
-
<tal:block
-
tal:condition="python: prop_units == 'bytes'"
-
tal:repeat="prop_opt prop_options">
-
<option tal:attributes="value prop_opt" />
-
<span
+
+
<tal:block tal:condition="python: prop_units == 'bytes'">
+
<tal:block
tal:define="
-
dummy python: here.bytes_to_value_units(prop_opt);
-
value python: str(dummy[0]) + ' ' + str(dummy[1])"
-
tal:replace="value" />
+
dummy2 python:map(lambda x: int(x), prop_options);
+
dummy3 python:dummy2.sort()"
+
tal:repeat="prop_opt dummy2">
+
<option tal:attributes="
+
value prop_opt;
+
selected python:prop.get('default_val')
== str(prop_opt) and 'selected' or ''" />
+
<span
+
tal:define="
+
dummy python:
here.bytes_to_value_units(prop_opt);
+
value python: str(dummy[0]) + ' ' +
str(dummy[1])"
+
tal:replace="value" />
+
</tal:block>
</tal:block>
</select>
</tal:block>
