* [Cluster-devel] conga/luci site/luci/Extensions/storage_adapte ...
@ 2006-10-07 1:04 kupcevic
0 siblings, 0 replies; 2+ messages in thread
From: kupcevic @ 2006-10-07 1:04 UTC (permalink / raw)
To: cluster-devel.redhat.com
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">
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Cluster-devel] conga/luci site/luci/Extensions/storage_adapte ...
@ 2007-06-26 17:00 rmccabe
0 siblings, 0 replies; 2+ messages in thread
From: rmccabe @ 2007-06-26 17:00 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2007-06-26 17:00:53
Modified files:
luci/site/luci/Extensions: storage_adapters.py
luci/storage : form-macros index_html
Log message:
Add the long-promised 'reprobe storage' button.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/storage_adapters.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.3&r2=1.7.2.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/form-macros.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.17.2.5&r2=1.17.2.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/index_html.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.1&r2=1.7.2.2
--- conga/luci/site/luci/Extensions/storage_adapters.py 2007/06/18 18:39:33 1.7.2.3
+++ conga/luci/site/luci/Extensions/storage_adapters.py 2007/06/26 17:00:53 1.7.2.4
@@ -10,9 +10,13 @@
PT_MAPPER_TYPE, PT_PATH, STONAME, STORAGE, STORAGESYS, \
VIEW_BD, VIEW_BDS, VIEW_MAPPER, VIEW_MAPPERS
-from ricci_defines import MAPPER_SYS_TYPE, MAPPER_VG_TYPE, SYSTEM_PREFIX, VG_PREFIX
+from ricci_defines import MAPPER_SYS_TYPE, MAPPER_VG_TYPE, \
+ SYSTEM_PREFIX, VG_PREFIX
+
from LuciZope import get_systems_statuses
+from StorageReport import invalidate_storage_report
+
def createStorageChooser(self, request, systems):
dummynode = {}
@@ -29,6 +33,15 @@
except KeyError, e:
url = "."
+ if stoname and request.has_key('reprobe_storage'):
+ try:
+ invalidate_storage_report(request.SESSION, stoname)
+ redirect_url = '%s?%s' % (request['ACTUAL_URL'], request['QUERY_STRING'])
+ redirect_url = redirect_url.replace('&reprobe_storage=true', '')
+ request.RESPONSE.redirect(redirect_url)
+ except:
+ pass
+
try:
pagetype = request[PAGETYPE]
except KeyError, e:
--- conga/luci/storage/form-macros 2007/06/18 18:39:49 1.17.2.5
+++ conga/luci/storage/form-macros 2007/06/26 17:00:53 1.17.2.6
@@ -103,7 +103,7 @@
tal:define="batch_id python:here.apply_storage_changes(ricci, storage_report, request);
check_URL context/storage/check-batch/absolute_url;
check_url python:check_URL + '?storagename=' + storagename + '&batch_id=' + batch_id">
- <div metal:use-macro="here/form-macros/macros/display-commiting-changes"/>
+ <div metal:use-macro="here/form-macros/macros/display-committing-changes"/>
<form id="urls_form">
<input tal:attributes="type string:hidden;
name string:check_url;
@@ -148,7 +148,7 @@
} else {
m = msg;
}
- alert('An error has occured while commiting changes:\n\n' + m);
+ alert('An error has occured while committing changes:\n\n' + m);
window.location = err_url;
}
} else {
@@ -179,7 +179,7 @@
-<div metal:define-macro="display-commiting-changes">
+<div metal:define-macro="display-committing-changes">
<table style="width: 100%;">
<tr>
<td align="center">
@@ -188,7 +188,7 @@
</tr>
<tr>
<td align="center">
- <div style="padding-bottom: 4cm;">Commiting Changes</div>
+ <div style="padding-bottom: 4cm;">Committing Changes</div>
</td>
</tr>
</table>
--- conga/luci/storage/index_html 2007/06/18 18:39:49 1.7.2.1
+++ conga/luci/storage/index_html 2007/06/26 17:00:53 1.7.2.2
@@ -174,7 +174,7 @@
global storage_report nothing"/>
<span tal:omit-tag=""
tal:condition="storagename"
- tal:define="report_cached python:here.is_storage_report_cached(request.SESSION, storagename)">
+ tal:define="global report_cached python:here.is_storage_report_cached(request.SESSION, storagename)">
<span tal:omit-tag=""
tal:condition="report_cached">
<span tal:omit-tag=""
@@ -221,6 +221,17 @@
<metal:main-form-content use-macro="here/form-chooser/macros/main-form">
<h1>Future Site of Forms</h1>
</metal:main-form-content>
+ <div style="padding-top: 10px;"
+ tal:condition="report_cached">
+ <form>
+ <input type="hidden" name="reprobe_url"
+ tal:attributes="value
+ python:'%s?%s&reprobe_storage=true' % (request['ACTUAL_URL'], request['QUERY_STRING'])" />
+ <input class="form_button" type="button" name="reprobe"
+ value="Reprobe Storage"
+ onclick="javascript:location=this.form.reprobe_url.value;" />
+ </form>
+ </div>
</td>
<tal:comment replace="nothing"> End of main content block </tal:comment>
</tr>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-06-26 17:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-07 1:04 [Cluster-devel] conga/luci site/luci/Extensions/storage_adapte kupcevic
-- strict thread matches above, loose matches on Subject: below --
2007-06-26 17:00 rmccabe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).