etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Alert page - add type text row.

This commit is contained in:
Jessica Wang 2011-01-03 14:09:40 -08:00
parent d495be0546
commit f971141e97
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/jsp/alert.jsp
View File

@ -56,6 +56,18 @@
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
Type ID:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="typeid">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
@ -89,7 +101,7 @@
<form action="#" method="post">
<ol>
<li>
<input class="text textwatermark" type="text" id="adv_search_type" value="by type" />
<input class="text textwatermark" type="text" id="adv_search_typeid" value="by Type ID" />
</li>
</ol>
</form>

9
ui/scripts/cloud.core.alert.js
View File

@ -26,9 +26,9 @@ function alertGetSearchParams() {
var $advancedSearchPopup = getAdvancedSearchPopupInSearchContainer();
if ($advancedSearchPopup.length > 0 && $advancedSearchPopup.css("display") != "none" ) {
var type = $advancedSearchPopup.find("#adv_search_type").val();
if ($advancedSearchPopup.find("#adv_search_type").hasClass("textwatermark") == false && type!=null && type.length > 0)
moreCriteria.push("&type="+todb(type));
var typeid = $advancedSearchPopup.find("#adv_search_typeid").val();
if ($advancedSearchPopup.find("#adv_search_typeid").hasClass("textwatermark") == false && typeid!=null && typeid.length > 0)
moreCriteria.push("&type="+todb(typeid)); //"type" paramter in listAlerts refers to typeId, not typeText
}
return moreCriteria.join("");
@ -69,7 +69,8 @@ function alertJsonToDetailsTab() {
$thisTab.find("#tab_spinning_wheel").show();
$thisTab.find("#id").text(fromdb(jsonObj.id));
$thisTab.find("#type").text(fromdb(jsonObj.type));
$thisTab.find("#type").text(toAlertType(jsonObj.type));
$thisTab.find("#typeid").text(fromdb(jsonObj.type));
$thisTab.find("#description").text(fromdb(jsonObj.description));
setDateField(jsonObj.sent, $thisTab.find("#sent"));