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

Merge branch '2.1.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.x

This commit is contained in:
Prasanna Santhanam 2011-03-04 09:30:45 +05:30
parent 606dc47667 c0b58bc7d5
commit 2f62dd7344
8 changed files with 171 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/jsp/tab_events.jsp
View File

@ -136,9 +136,13 @@ long milliseconds = new Date().getTime();
</select>
</li>
<li id="adv_search_domain_li" style="display: none;">
<label for="filter">Domain:</label>
<label for="filter">Domain:</label>
<input class="text" type="text" id="domain" />
<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
<!--
<select class="select" id="adv_search_domain">
</select>
-->
</li>
<li id="adv_search_account_li" style="display: none;">
<label for="filter">Account:</label>

17
ui/jsp/tab_networking.jsp
View File

@ -51,7 +51,7 @@ long milliseconds = new Date().getTime();
<div class="select_directipbg_admin" style="display:block;">
<form action="#" method="post">
<ol>
<ol id="ip_search_panel1">
<li>
<p style="float:left; font-size:11px; font-weight:bold; color:#FFF; margin:7px 0 0 0;">Search </p>
@ -63,12 +63,19 @@ long milliseconds = new Date().getTime();
</form>
<form action="#" method="post">
<ol>
<ol id="ip_search_panel2">
<li style="margin-left:15px;">
<div class="ip_oricon"></div>
<input class="text ipwatermark_text" type="text" id="search_by_account" value="By Account"/>
<input class="text" type="text" id="search_by_domain" />
<!--
<div id="search_by_domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
-->
<!--
<select class="select" id="search_by_domain">
</select>
-->
</li>
</ol>
<div class="ip_searchbutton" id="ip_searchbutton2"></div>
@ -583,9 +590,13 @@ long milliseconds = new Date().getTime();
</li>
<li id="adv_search_domain_li" style="display: none;">
<label for="filter">
Domain:</label>
Domain:</label>
<input class="text" type="text" id="domain" />
<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
<!--
<select class="select" id="adv_search_domain">
</select>
-->
</li>
<li id="adv_search_account_li" style="display: none;">
<label for="filter">

6
ui/jsp/tab_storage.jsp
View File

@ -1336,9 +1336,13 @@ long milliseconds = new Date().getTime();
<form action="#" method="post">
<ol>
<li id="adv_search_domain_li" style="display: none;">
<label for="filter">Domain:</label>
<label for="filter">Domain:</label>
<input class="text" type="text" id="domain" />
<div id="domain_errormsg" class="dialog_formcontent_errormsg" style="display: none;">
<!--
<select class="select" id="adv_search_domain">
</select>
-->
</li>
<li id="adv_search_account_li" style="display: none;">
<label for="filter">

18
ui/scripts/cloud.core.configuration.js
View File

@ -640,23 +640,7 @@ function showConfigurationTab() {
}
});
applyAutoCompleteToDomainField(dialogAddVlanForZone.find("#domain"));
/*
var domainSelect = dialogAddVlanForZone.find("#add_publicip_vlan_domain").empty();
$.ajax({
data: "command=listDomains&response=json",
dataType: "json",
async: false,
success: function(json) {
var domains = json.listdomainsresponse.domain;
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>");
}
}
}
});
*/
applyAutoCompleteToDomainField(dialogAddVlanForZone.find("#domain"));
}
dialogAddVlanForZone

51
ui/scripts/cloud.core.events.js
View File

@ -43,25 +43,52 @@ function showEventsTab(showEvents) {
var commandString;
var advanced = submenuContent.find("#search_button").data("advanced");
if (advanced != null && advanced) {
var moreCriteria = [];
var type = submenuContent.find("#advanced_search #adv_search_type").val();
var level = submenuContent.find("#advanced_search #adv_search_level").val();
var domainId = submenuContent.find("#advanced_search #adv_search_domain").val();
var account = submenuContent.find("#advanced_search #adv_search_account").val();
var startdate = submenuContent.find("#advanced_search #adv_search_startdate").val();
var enddate = submenuContent.find("#advanced_search #adv_search_enddate").val();
var moreCriteria = [];
if (type!=null && trim(type).length > 0)
if (type!=null && trim(type).length > 0)
moreCriteria.push("&type="+encodeURIComponent(trim(type)));
var level = submenuContent.find("#advanced_search #adv_search_level").val();
if (level!=null && level.length > 0)
moreCriteria.push("&level="+encodeURIComponent(trim(level)));
if (domainId!=null && domainId.length > 0)
moreCriteria.push("&domainid="+domainId);
if (account!=null && account.length > 0)
moreCriteria.push("&account="+account);
if (startdate!=null && startdate.length > 0)
if (submenuContent.find("#adv_search_domain_li").css("display") != "none") {
var domainName = submenuContent.find("#domain").val();
if (domainName != null && domainName.length > 0) {
var domainId;
if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
for(var i=0; i < autoCompleteDomains.length; i++) {
if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
domainId = autoCompleteDomains[i].id;
break;
}
}
}
if(domainId == null) {
showError(false, submenuContent.find("#domain"), submenuContent.find("#domain_errormsg"), g_dictionary["label.not.found"]);
}
else { //e.g. domainId == "5"
showError(true, submenuContent.find("#domain"), submenuContent.find("#domain_errormsg"), null)
moreCriteria.push("&domainid="+todb(domainId));
}
}
}
if (submenuContent.find("#adv_search_account_li").css("display") != "none") {
var account = submenuContent.find("#advanced_search #adv_search_account").val();
if (account!=null && account.length > 0)
moreCriteria.push("&account="+account);
}
var startdate = submenuContent.find("#advanced_search #adv_search_startdate").val();
if (startdate!=null && startdate.length > 0)
moreCriteria.push("&startdate="+encodeURIComponent(startdate));
var enddate = submenuContent.find("#advanced_search #adv_search_enddate").val();
if (enddate!=null && enddate.length > 0)
moreCriteria.push("&enddate="+encodeURIComponent(enddate));
commandString = "command=listEvents&page="+currentPage+moreCriteria.join("")+"&response=json";
} else {
var searchInput = submenuContent.find("#search_input").val();

5
ui/scripts/cloud.core.js
View File

@ -90,6 +90,7 @@ function applyAutoCompleteToDomainField($field) {
});
}
/*
function applyAutoCompleteToDomainChildrenField($field, parentDomainId) {
$field.autocomplete({
source: function(request, response) {
@ -122,6 +123,7 @@ function applyAutoCompleteToDomainChildrenField($field, parentDomainId) {
}
});
}
*/
// Role Functions
function isAdmin() {
@ -319,6 +321,7 @@ function submenuContentEventBinder(submenuContent, listFunction) {
applyAutoCompleteToDomainField(submenuContent.find("#advanced_search #domain"));
/*
var domainSelect = submenuContent.find("#advanced_search #adv_search_domain");
if(domainSelect.length>0 && isAdmin()) {
var domainSelect = domainSelect.empty();
@ -335,7 +338,7 @@ function submenuContentEventBinder(submenuContent, listFunction) {
}
});
}
*/
var vmSelect = submenuContent.find("#advanced_search").find("#adv_search_vm");
if(vmSelect.length>0) {

113
ui/scripts/cloud.core.network.js
View File

@ -209,31 +209,41 @@ function showNetworkingTab(p_domainId, p_account) {
//watermark (end)
$("#submenu_content_network #ip_searchbutton1").bind("click", refreshIpListContainerByInputBox);
function populateDomainDropdown() {
var domainSelect = $("#submenu_content_network #search_by_domain").empty();
$.ajax({
data: "command=listDomains&available=true&response=json",
dataType: "json",
success: function(json) {
var domains = json.listdomainsresponse.domain;
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>");
}
}
}
});
}
$("#submenu_content_network #ip_searchbutton2").bind("click", function(event){
var array1 = [];
var account = $("#submenu_content_network #search_by_account").val();
$("#submenu_content_network").find("#ip_searchbutton2").bind("click", function(event){
var $searchPanel2= $("#submenu_content_network").find("#ip_search_panel2");
var moreCriteria = [];
var account = $searchPanel2.find("#search_by_account").val();
if(account != null && account.length > 0)
array1.push("&account=" + account);
var domainId = $("#submenu_content_network #search_by_domain").val();
array1.push("&domainid=" + domainId);
refreshIpListContainer("command=listPublicIpAddresses&response=json&forvirtualnetwork=true" + array1.join(""));
moreCriteria.push("&account=" + account);
var domainName = $searchPanel2.find("#search_by_domain").val();
if (domainName != null && domainName.length > 0) {
var domainId;
if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
for(var i=0; i < autoCompleteDomains.length; i++) {
if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
domainId = autoCompleteDomains[i].id;
break;
}
}
}
if(domainId == null) {
//showError(false, $searchPanel2.find("#search_by_domain"), $searchPanel2.find("#search_by_domain_errormsg"), "Not Found");
}
else { //e.g. domainId == "5"
//showError(true, $searchPanel2.find("#search_by_domain"), $searchPanel2.find("#search_by_domain_errormsg"), null)
moreCriteria.push("&domainid="+todb(domainId));
}
}
/*
var domainId = $searchPanel2.find("#search_by_domain").val();
moreCriteria.push("&domainid=" + domainId);
*/
refreshIpListContainer("command=listPublicIpAddresses&response=json&forvirtualnetwork=true" + moreCriteria.join(""));
return false;
});
@ -1020,8 +1030,8 @@ function showNetworkingTab(p_domainId, p_account) {
if(isAdmin()) {
submenuContent.find(".select_directipbg_admin").show();
submenuContent.find(".select_directipbg_user").hide();
populateDomainDropdown();
submenuContent.find(".select_directipbg_user").hide();
applyAutoCompleteToDomainField($("#submenu_content_network #search_by_domain"));
} else {
submenuContent.find(".select_directipbg_admin").hide();
submenuContent.find(".select_directipbg_user").show();
@ -1174,19 +1184,44 @@ function showNetworkingTab(p_domainId, p_account) {
var commandString;
var advanced = submenuContent.find("#search_button").data("advanced");
if (advanced != null && advanced) {
var name = submenuContent.find("#advanced_search #adv_search_name").val();
var virtualMachineId = submenuContent.find("#advanced_search #adv_search_vm").val();
var domainId = submenuContent.find("#advanced_search #adv_search_domain").val();
var account = submenuContent.find("#advanced_search #adv_search_account").val();
var moreCriteria = [];
if (name!=null && trim(name).length > 0)
moreCriteria.push("&networkgroupname="+encodeURIComponent(trim(name)));
if (virtualMachineId!=null && virtualMachineId.length > 0)
moreCriteria.push("&virtualmachineid="+encodeURIComponent(virtualMachineId));
if (domainId!=null && domainId.length > 0)
moreCriteria.push("&domainid="+domainId);
if (account!=null && account.length > 0)
moreCriteria.push("&account="+account);
var moreCriteria = [];
var name = submenuContent.find("#advanced_search #adv_search_name").val();
if (name!=null && trim(name).length > 0)
moreCriteria.push("&networkgroupname="+encodeURIComponent(trim(name)));
var virtualMachineId = submenuContent.find("#advanced_search #adv_search_vm").val();
if (virtualMachineId!=null && virtualMachineId.length > 0)
moreCriteria.push("&virtualmachineid="+encodeURIComponent(virtualMachineId));
if (submenuContent.find("#adv_search_domain_li").css("display") != "none") {
var domainName = submenuContent.find("#domain").val();
if (domainName != null && domainName.length > 0) {
var domainId;
if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
for(var i=0; i < autoCompleteDomains.length; i++) {
if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
domainId = autoCompleteDomains[i].id;
break;
}
}
}
if(domainId == null) {
showError(false, submenuContent.find("#domain"), submenuContent.find("#domain_errormsg"), g_dictionary["label.not.found"]);
}
else { //e.g. domainId == "5"
showError(true, submenuContent.find("#domain"), submenuContent.find("#domain_errormsg"), null)
moreCriteria.push("&domainid="+todb(domainId));
}
}
}
if (submenuContent.find("#adv_search_account_li").css("display") != "none") {
var account = submenuContent.find("#advanced_search #adv_search_account").val();
if (account!=null && account.length > 0)
moreCriteria.push("&account="+account);
}
commandString = "command=listNetworkGroups&page=" + currentPage + moreCriteria.join("") + "&response=json";
} else {
var moreCriteria = [];

35
ui/scripts/cloud.core.storage.js
View File

@ -398,13 +398,36 @@ function showStorageTab(domainId, targetTab) {
var commandString;
var advanced = submenuContent.find("#search_button").data("advanced");
if (advanced != null && advanced) {
var domainId = submenuContent.find("#advanced_search #adv_search_domain").val();
var account = submenuContent.find("#advanced_search #adv_search_account").val();
var moreCriteria = [];
if (domainId!=null && domainId.length > 0)
moreCriteria.push("&domainid="+domainId);
if (account!=null && account.length > 0)
moreCriteria.push("&account="+account);
if (submenuContent.find("#adv_search_domain_li").css("display") != "none") {
var domainName = submenuContent.find("#domain").val();
if (domainName != null && domainName.length > 0) {
var domainId;
if(autoCompleteDomains != null && autoCompleteDomains.length > 0) {
for(var i=0; i < autoCompleteDomains.length; i++) {
if(fromdb(autoCompleteDomains[i].name).toLowerCase() == domainName.toLowerCase()) {
domainId = autoCompleteDomains[i].id;
break;
}
}
}
if(domainId == null) {
showError(false, submenuContent.find("#domain"), submenuContent.find("#domain_errormsg"), g_dictionary["label.not.found"]);
}
else { //e.g. domainId == "5"
showError(true, submenuContent.find("#domain"), submenuContent.find("#domain_errormsg"), null)
moreCriteria.push("&domainid="+todb(domainId));
}
}
}
if (submenuContent.find("#adv_search_account_li").css("display") != "none") {
var account = submenuContent.find("#advanced_search #adv_search_account").val();
if (account!=null && account.length > 0)
moreCriteria.push("&account="+account);
}
commandString = "command=listSnapshots&page="+currentPage+moreCriteria.join("")+"&response=json";
} else {
var moreCriteria = [];