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

search dialog - add "by zone", "by pod", "by domain" as the first option in dropdown field. (because label has been removed to save space)

This commit is contained in:
Jessica Wang 2010-12-27 18:22:27 -08:00
parent 0445358321
commit d28cd86e3a
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/jsp/instance.jsp
View File

@ -1496,7 +1496,7 @@
<ol>
<li>
<select class="select" id="adv_search_state">
<option value=""></option>
<option value="">by state</option>
<option value="Creating">Creating</option>
<option value="Starting">Starting</option>
<option value="Running">Running</option>
@ -1549,7 +1549,7 @@
<ol>
<li>
<select class="select" id="adv_search_state">
<option value=""></option>
<option value="">by state</option>
<option value="Creating">Creating</option>
<option value="Starting">Starting</option>
<option value="Running">Running</option>

24
ui/scripts/cloud.core.init.js
View File

@ -309,7 +309,7 @@ $(document).ready(function() {
success: function(json) {
var zones = json.listzonesresponse.zone;
zoneSelect.empty();
zoneSelect.append("<option value=''></option>");
zoneSelect.append("<option value=''>by zone</option>");
if (zones != null && zones.length > 0) {
for (var i = 0; i < zones.length; i++) {
zoneSelect.append("<option value='" + zones[i].id + "'>" + fromdb(zones[i].name) + "</option>");
@ -336,7 +336,8 @@ $(document).ready(function() {
async: false,
success: function(json) {
var pods = json.listpodsresponse.pod;
podSelect.empty();
podSelect.empty();
podSelect.append("<option value=''>by pod</option>");
if (pods != null && pods.length > 0) {
for (var i = 0; i < pods.length; i++) {
podSelect.append("<option value='" + pods[i].id + "'>" + fromdb(pods[i].name) + "</option>");
@ -353,13 +354,14 @@ $(document).ready(function() {
}
var domainSelect = $advancedSearchPopup.find("#adv_search_domain");
if(domainSelect.length>0 && $advancedSearchPopup.find("#adv_search_domain_li").css("display")!="none") {
var domainSelect = domainSelect.empty();
if(domainSelect.length>0 && $advancedSearchPopup.find("#adv_search_domain_li").css("display")!="none") {
$.ajax({
data: createURL("command=listDomains&available=true"),
dataType: "json",
success: function(json) {
var domains = json.listdomainsresponse.domain;
var domains = json.listdomainsresponse.domain;
domainSelect.empty();
domainSelect.append("<option value=''>by domain</option>");
if (domains != null && domains.length > 0) {
for (var i = 0; i < domains.length; i++) {
domainSelect.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>");
@ -368,16 +370,17 @@ $(document).ready(function() {
}
});
}
/*
var vmSelect = $advancedSearchPopup.find("#adv_search_vm");
if(vmSelect.length>0) {
vmSelect.empty();
vmSelect.append("<option value=''></option>");
if(vmSelect.length>0) {
$.ajax({
data: createURL("command=listVirtualMachines"),
dataType: "json",
success: function(json) {
var items = json.listvirtualmachinesresponse.virtualmachine;
var items = json.listvirtualmachinesresponse.virtualmachine;
vmSelect.empty();
vmSelect.append("<option value=''>by instance</option>");
if (items != null && items.length > 0) {
for (var i = 0; i < items.length; i++) {
vmSelect.append("<option value='" + items[i].id + "'>" + fromdb(items[i].name) + "</option>");
@ -386,6 +389,7 @@ $(document).ready(function() {
}
});
}
*/
$advancedSearchPopup.find("#adv_search_startdate, #adv_search_enddate").datepicker({dateFormat: 'yy-mm-dd'});
}