[Cluster-devel] conga/luci site/luci/Extensions/storage_adapte ...
kupcevic at sourceware.org
kupcevic at sourceware.org
Sat Oct 7 01:04:02 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-10-07 01:04:01
Modified files:
luci/site/luci/Extensions: storage_adapters.py
luci/storage : form-chooser form-macros mappings_provider
Log message:
luci storage: display BD only as a part of a MAPPER
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/storage_adapters.py.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-chooser.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/mappings_provider.diff?cvsroot=cluster&r1=1.1&r2=1.2
--- conga/luci/site/luci/Extensions/storage_adapters.py 2006/08/03 18:56:10 1.3
+++ conga/luci/site/luci/Extensions/storage_adapters.py 2006/10/07 01:04:01 1.4
@@ -224,15 +224,11 @@
sr['absolute_url'] = url + '?' + PAGETYPE + '=' + VIEW_MAPPER + '&' + STONAME + '=' + hostname + '&' + PT_MAPPER_TYPE + '=' + mapper_type + '&' + PT_MAPPER_ID + '=' + sr_id
sr['Description'] = pretty_name_desc
- if pagetype_req == VIEW_BD and mapper_id_req == sr_id:
- sr['show_children'] = True
- else:
- sr['show_children'] = False
-
- if pagetype_req == VIEW_MAPPER and mapper_id_req == sr_id:
+ if (pagetype_req == VIEW_MAPPER or pagetype_req == VIEW_BD) and mapper_id_req == sr_id:
sr['currentItem'] = True
else:
sr['currentItem'] = False
+ sr['show_children'] = False
# targets
tgts_list = []
--- conga/luci/storage/form-chooser 2006/08/03 18:56:09 1.2
+++ conga/luci/storage/form-chooser 2006/10/07 01:04:01 1.3
@@ -44,6 +44,16 @@
<div metal:use-macro="here/form-macros/macros/view-mappers-form"/>
</span>
+ <span tal:omit-tag=""
+ tal:define="mapper_id request/mapper_id|nothing"
+ tal:condition="mapper_id">
+ <span tal:omit-tag=""
+ tal:condition="python: mapper_id != 'hard_drives:' and pagetype == '62'">
+ <span tal:omit-tag=""
+ tal:define="global pagetype string:52"/>
+ </span>
+ </span>
+
<span tal:omit-tag="" tal:condition="python: pagetype == '52' and storage_report != None">
<div metal:use-macro="here/form-macros/macros/view-mapper-form"/>
</span>
--- conga/luci/storage/form-macros 2006/10/06 22:59:26 1.7
+++ conga/luci/storage/form-macros 2006/10/07 01:04:01 1.8
@@ -509,9 +509,15 @@
Graphical View
<span id="mappings_view">
- <div id="graphical_view" class="visible">
+ <div id="graphical_view" class="visible"
+ tal:define="global bd_path request/bd_path|nothing">
+ <span tal:omit-tag=""
+ tal:condition="not: bd_path">
+ <span tal:omit-tag=""
+ tal:define="global bd_path python:''"/>
+ </span>
<iframe style="border: none;"
- tal:attributes="src python:'mappings_provider?storagename=' + storagename + '&mapper_id=' + mapper['mapper_id'];
+ tal:attributes="src python:'mappings_provider?storagename=' + storagename + '&mapper_id=' + mapper['mapper_id'] + '&selected_path=' + bd_path;
width string:700px;
height string:180"></iframe>
</div>
--- conga/luci/storage/mappings_provider 2006/06/30 17:00:02 1.1
+++ conga/luci/storage/mappings_provider 2006/10/07 01:04:01 1.2
@@ -143,7 +143,9 @@
select_subcyl(id, h_data);
}
}
-
+
+
+
</script>
<style>
@@ -156,9 +158,18 @@
</head>
+<span tal:omit-tag=""
+ tal:define="default_sel request/selected_path|nothing;
+ global default_selection_c python:''"
+ tal:condition="default_sel">
+ <span tal:omit-tag=""
+ tal:define="global default_selection_c python:'select_subcyl(\'' + default_sel + '\', ' + mapp_info['js'] + ')'"/>
+</span>
+
<body tal:define="onload_c python:'properties_span_id = \'' + mapper['mapper_id'] + '_properties_span_id\'';
onload_c python:here.add_commas(onload_c, 'current_selection = \'' + mapp_info['mapper']['mapper_id'] + '\'');
- onload_c python:here.add_commas(onload_c, 'display_props(' + mapp_info['js'] + ')')"
+ onload_c python:here.add_commas(onload_c, 'display_props(' + mapp_info['js'] + ')');
+ onload_c python:here.add_commas(onload_c, default_selection_c)"
tal:attributes="onload onload_c">
More information about the Cluster-devel
mailing list