[FIX]can not expunge volume

#123
zstackio · Oct 9, 2016 · 757955d · 757955d
1 parent 8c12464
commit 757955d
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 7 deletions.
diff --git a/zstack_dashboard/static/resources/locale-en_US.json b/zstack_dashboard/static/resources/locale-en_US.json
@@ -152,8 +152,6 @@
     "vm.changeInstanceOffering.INSTANCE OFFERING": "INSTANCE OFFERING",
     "vm.changeInstanceOffering.Cancel": "Cancel",
     "vm.changeInstanceOffering.Change": "Change",
-    "vm.createVm.hasImage()": "No image is eligible to create vm. Eligible images are ones with state 'Enabled' and status 'Ready'.",
-    "vm.createVm.hasInstanceOffering()": "No instance offering is eligible to create vm. Eligible instance offerings are ones with state 'Enabled'.",
     "vm.attachVolume.ATTACH DATA VOLUME": "ATTACH DATA VOLUME",
     "vm.attachVolume.DATA VOLUME": "DATA VOLUME",
     "vm.attachVolume.HINT": "(Required) volumes listed here are candidate that could be attached to this vm",

diff --git a/zstack_dashboard/static/resources/locale-zh_CN.json b/zstack_dashboard/static/resources/locale-zh_CN.json
@@ -153,8 +153,6 @@
     "vm.changeInstanceOffering.INSTANCE OFFERING": "计算规格",
     "vm.changeInstanceOffering.Cancel": "取消",
     "vm.changeInstanceOffering.Change": "更改",
-    "vm.createVm.hasImage()": "没有可用的镜像. 有效镜像的可用状态为 'Enabled' 连接状态为 'Ready'",
-    "vm.createVm.hasInstanceOffering()": "没有可用的计算规格. 有效的计算规格的可用状态为 'Enabled'",
     "vm.attachVolume.ATTACH DATA VOLUME": "挂载数据云盘",
     "vm.attachVolume.DATA VOLUME": "数据云盘",
     "vm.attachVolume.HINT": "(必需的) 可供挂载的云盘列表",

diff --git a/zstack_dashboard/static/resources/locale-zh_TW.json b/zstack_dashboard/static/resources/locale-zh_TW.json
@@ -152,8 +152,6 @@
     "vm.changeInstanceOffering.INSTANCE OFFERING": "雲主機規格",
     "vm.changeInstanceOffering.Cancel": "取消",
     "vm.changeInstanceOffering.Change": "更改",
-    "vm.createVm.hasImage()": "沒有可以建立雲主機的映像檔. 有效映像檔的可用狀態為'Enabled' 連接狀態為'Ready'",
-    "vm.createVm.hasInstanceOffering()": "沒有可以建立雲主機的雲主機規格. 有效的雲主機規格的可用狀態為'Enabled'",
     "vm.attachVolume.ATTACH DATA VOLUME": "掛載數據磁碟",
     "vm.attachVolume.DATA VOLUME": "數據磁碟",
     "vm.attachVolume.HINT": "(必需的) 在這裡列出可以掛載到此虛擬機的候選雲磁碟",

diff --git a/zstack_dashboard/static/templates/vm/createVm.html b/zstack_dashboard/static/templates/vm/createVm.html
@@ -7,7 +7,7 @@
                         {{"vm.createVm.hasImage()" | translate}}
                     </div>
                     <div class="alert alert-warning col-sm-21" ng-show="!infoPage.hasInstanceOffering()">
-                        {{"vm.createVm.hasInstanceOffering" | translate}}
+                        {{"vm.createVm.hasInstanceOffering()" | translate}}
                     </div>
 
                     <h4 class="z-win-h4">{{"vm.createVm.VM INSTANCE INFO" | translate}}</h4>

diff --git a/zstack_dashboard/static/templates/volume/details.html b/zstack_dashboard/static/templates/volume/details.html
@@ -1,5 +1,6 @@
 <div style="display: none">
     <div z-confirm="deleteVolume" z-options="optionsDeleteVolume"></div>
+    <div z-confirm="expungeVolume" z-options="optionsExpungeVolume"></div>
     <div z-volume-attach-vm="attachVm" z-options="optionsAttachVm"></div>
     <div z-volume-detach-vm="detachVm" z-options="optionsDetachVm"></div>
     <div z-volume-take-snapshot="takeSnapshot" z-options="optionsTakeSnapshot"></div>