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

bug 10356: cloudStack UI - System Service Offerings page - (1) add a grid row "Default Use". (2) Hide Delete Action and Edit Action when Default Use is true.

This commit is contained in:
Jessica Wang 2011-06-21 14:48:29 -07:00
parent 0cf9d8b788
commit 33e87159e5
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ui/jsp/systemserviceoffering.jsp
View File

@ -158,6 +158,17 @@ dictionary = {
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.default.use"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="defaultuse">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.domain"/>:</div>
@ -170,7 +181,7 @@ dictionary = {
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.created"/>:</div>

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

@ -330,6 +330,8 @@ function systemServiceOfferingJsonToDetailsTab() {
$thisTab.find("#tags").text(fromdb(jsonObj.tags));
$thisTab.find("#tags_edit").val(fromdb(jsonObj.tags));
setBooleanReadField(jsonObj.defaultuse, $thisTab.find("#defaultuse"));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));
$thisTab.find("#domain_edit").val(fromdb(jsonObj.domainid));
@ -338,9 +340,16 @@ function systemServiceOfferingJsonToDetailsTab() {
//actions ***
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForTab("label.action.edit.service.offering", systemServiceOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("label.action.delete.service.offering", systemServiceOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
$actionMenu.find("#action_list").empty();
var noAvailableActions = true;
if(jsonObj.defaultuse == false) {
buildActionLinkForTab("label.action.edit.service.offering", systemServiceOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("label.action.delete.service.offering", systemServiceOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
if(noAvailableActions == true) {
$actionMenu.find("#action_list").append($("#no_available_actions").clone().show());
}
$thisTab.find("#tab_spinning_wheel").hide();
$thisTab.find("#tab_container").show();
@ -364,7 +373,8 @@ function systemServiceOfferingClearDetailsTab() {
$thisTab.find("#offerha").text("");
$thisTab.find("#offerha_edit").val("");
$thisTab.find("#limitcpuuse").text("");
$thisTab.find("#tags").text("");
$thisTab.find("#tags").text("");
$thisTab.find("#defaultuse").text("");
$thisTab.find("#domain").text("");
$thisTab.find("#domain_edit").val("");
$thisTab.find("#created").text("");