shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-13 13:17:39 +03:00
Code Releases Wiki Activity

Bug #4117: Hide VM cpu & mem when showback is disabled, show VM disk cost in storage tab

Browse Source 
(cherry picked from commit f4a2d332da)
This commit is contained in:
Carlos Martín 2015-11-04 16:06:46 +01:00
parent 4ef06eab8b
commit 562a3271bd
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sunstone/public/app/tabs/vms-tab/panels/capacity/html.hbs
View File

@ -22,8 +22,10 @@
<th>{{tr "CPU"}}</th>
<th>{{tr "VCPU"}}</th>
<th>{{tr "MEMORY"}}</th>
{{#isFeatureEnabled "showback"}}
<th>{{tr "Cost / CPU"}}</th>
<th>{{tr "Cost / MByte"}}</th>
{{/isFeatureEnabled}}
<th></th>
</tr>
</thead>
@ -32,8 +34,10 @@
<td id="cpu_info">{{valOrDefault element.TEMPLATE.CPU '-'}}</td>
<td id="vcpu_info">{{valOrDefault element.TEMPLATE.VCPU '-'}}</td>
<td id="memory_info">{{humanizeSize "MB" element.TEMPLATE.MEMORY}}</td>
{{#isFeatureEnabled "showback"}}
<td id="cpu_cost_info">{{valOrDefault element.TEMPLATE.CPU_COST '-'}}</td>
<td id="memory_cost_info" >{{valOrDefault element.TEMPLATE.MEMORY_COST '-'}}</td>
{{/isFeatureEnabled}}
<td>
{{#isTabActionEnabled "vms-tab" "VM.resize"}}
{{#if resizeStateEnabled}}

14
src/sunstone/public/app/tabs/vms-tab/panels/storage/html.hbs
View File

@ -42,4 +42,18 @@
</table>
</div>
</div>
{{#isFeatureEnabled "showback"}}
<div class="row">
<div class="small-12 columns">
<table>
<tbody>
<tr>
<td class="key_td">{{tr "Cost / MByte"}}</td>
<td class="value_td">{{valOrDefault element.TEMPLATE.DISK_COST '-'}}</td>
</tr>
</tbody>
</table>
</div>
</div>
{{/isFeatureEnabled}}
</form>