Skip to content

Commit

Permalink
[fix]i118 error
Browse files Browse the repository at this point in the history
  • Loading branch information
@QiRaining
QiRaining committed Feb 9, 2017
1 parent fbc2815 commit 5e3ea06
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 30 deletions.
10 changes: 5 additions & 5 deletions ts/volume.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1068,11 +1068,11 @@ module MVolume {
'<span class="caret"></span>' +
'</button>' +
'<ul class="dropdown-menu" role="menu">' +
'<li><a href="/\\#/volumeSnapshot/{{dataItem.inventory.uuid}}">See details</a></li>' +
'<li><a href ng-click="revertToSnapshot(dataItem.inventory)" ng-show="dataItem.inventory.isRevertShow()">Revert volume to this snapshot</a></li>' +
'<li><a href ng-click="backupSnapshot(dataItem.inventory)" ng-show="dataItem.inventory.isBackupShow()">Backup</a></li>' +
'<li><a href ng-click="deleteSnapshotFromBackupStorage(dataItem.inventory)" ng-show="dataItem.inventory.isDeleteFromBackupStorageShow()">Delete From Backup Storage</a></li>' +
'<li><a href style="color:red" ng-click="deleteSnapshot(dataItem.inventory)">Delete</a></li>' +
'<li><a href="/\\#/volumeSnapshot/{{dataItem.inventory.uuid}}">{{"volume.ts.See details" | translate}}</a></li>' +
'<li><a href ng-click="revertToSnapshot(dataItem.inventory)" ng-show="dataItem.inventory.isRevertShow()">{{"volume.ts.Revert volume to this snapshot" | translate}}</a></li>' +
'<li><a href ng-click="backupSnapshot(dataItem.inventory)" ng-show="dataItem.inventory.isBackupShow()">{{"volume.ts.Backup" | translate}}</a></li>' +
'<li><a href ng-click="deleteSnapshotFromBackupStorage(dataItem.inventory)" ng-show="dataItem.inventory.isDeleteFromBackupStorageShow()">{{"volume.ts.Delete From Backup Storage" | translate}}</a></li>' +
'<li><a href style="color:red" ng-click="deleteSnapshot(dataItem.inventory)">{{"volume.ts.Delete" | translate}}</a></li>' +
'</ul>' +
'</div>',

Expand Down
10 changes: 5 additions & 5 deletions zstack_dashboard/static/app/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22051,11 +22051,11 @@ var MVolume;
'<span class="caret"></span>' +
'</button>' +
'<ul class="dropdown-menu" role="menu">' +
'<li><a href="/\\#/volumeSnapshot/{{dataItem.inventory.uuid}}">See details</a></li>' +
'<li><a href ng-click="revertToSnapshot(dataItem.inventory)" ng-show="dataItem.inventory.isRevertShow()">Revert volume to this snapshot</a></li>' +
'<li><a href ng-click="backupSnapshot(dataItem.inventory)" ng-show="dataItem.inventory.isBackupShow()">Backup</a></li>' +
'<li><a href ng-click="deleteSnapshotFromBackupStorage(dataItem.inventory)" ng-show="dataItem.inventory.isDeleteFromBackupStorageShow()">Delete From Backup Storage</a></li>' +
'<li><a href style="color:red" ng-click="deleteSnapshot(dataItem.inventory)">Delete</a></li>' +
'<li><a href="/\\#/volumeSnapshot/{{dataItem.inventory.uuid}}">{{"volume.ts.See details" | translate}}</a></li>' +
'<li><a href ng-click="revertToSnapshot(dataItem.inventory)" ng-show="dataItem.inventory.isRevertShow()">{{"volume.ts.Revert volume to this snapshot" | translate}}</a></li>' +
'<li><a href ng-click="backupSnapshot(dataItem.inventory)" ng-show="dataItem.inventory.isBackupShow()">{{"volume.ts.Backup" | translate}}</a></li>' +
'<li><a href ng-click="deleteSnapshotFromBackupStorage(dataItem.inventory)" ng-show="dataItem.inventory.isDeleteFromBackupStorageShow()">{{"volume.ts.Delete From Backup Storage" | translate}}</a></li>' +
'<li><a href style="color:red" ng-click="deleteSnapshot(dataItem.inventory)">{{"volume.ts.Delete" | translate}}</a></li>' +
'</ul>' +
'</div>',
dataSource: new kendo.data.HierarchicalDataSource({
Expand Down
6 changes: 6 additions & 0 deletions zstack_dashboard/static/resources/locale-en_US.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,7 @@
"volume.reverSnapshot.VOLUME NAME": "VOLUME NAME:",
"volume.reverSnapshot.VOLUME TYPE": "VOLUME TYPE:",
"volume.reverSnapshot.SNAPSHOT NAME": "SNAPSHOT NAME:",
"volume.reverSnapshot.SNAPSHOT UUID": "SNAPSHOT UUID:",
"volume.reverSnapshot.VM THE VOLUME ATTACHED": "VM THE VOLUME ATTACHED:",
"volume.reverSnapshot.HINT": "Volume can only be reverted to snapshot when vm it attaches is stopped",
"volume.reverSnapshot.Cancel": "Cancel",
Expand Down Expand Up @@ -1610,6 +1611,11 @@
"volume.ts.Last Updated Date": "Last Updated Date",
"volume.ts.DISK SIZE": "DISK SIZE",
"volume.ts.Hypervisor": "Hypervisor",
"volume.ts.See details": "See Details",
"volume.ts.Revert volume to this snapshot": "Revert volume to this snapshot",
"volume.ts.Backup": "Backup",
"volume.ts.Delete From Backup Storage": "Delete From Backup Storage",
"volume.ts.Delete": "Delete",
"l2Network.ts.NAME": "NAME",
"l2Network.ts.DESCRIPTION": "DESCRIPTION",
"l2Network.ts.PHYSICAL INTERFACE": "PHYSICAL INTERFACE",
Expand Down
6 changes: 6 additions & 0 deletions zstack_dashboard/static/resources/locale-zh_CN.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,7 @@
"volume.reverSnapshot.VOLUME NAME": "云盘名称:",
"volume.reverSnapshot.VOLUME TYPE": "云盘类型:",
"volume.reverSnapshot.SNAPSHOT NAME": "快照名称:",
"volume.reverSnapshot.SNAPSHOT UUID": "快照UUID:",
"volume.reverSnapshot.VM THE VOLUME ATTACHED": "已挂载云盘的云主机:",
"volume.reverSnapshot.HINT": "只有云主机处于停止状态时，云盘快照才可还原",
"volume.reverSnapshot.Cancel": "取消",
Expand Down Expand Up @@ -1610,6 +1611,11 @@
"volume.ts.Last Updated Date": "上次更新时间",
"volume.ts.DISK SIZE": "磁盘大小",
"volume.ts.Hypervisor": "虚拟化类型",
"volume.ts.See details": "查看详细信息",
"volume.ts.Revert volume to this snapshot": "恢复云盘到此快照",
"volume.ts.Backup": "备份",
"volume.ts.Delete From Backup Storage": "从备份存储删除",
"volume.ts.Delete": "删除",
"l2Network.ts.NAME": "名称",
"l2Network.ts.DESCRIPTION": "描述",
"l2Network.ts.PHYSICAL INTERFACE": "物理接口",
Expand Down
6 changes: 6 additions & 0 deletions zstack_dashboard/static/resources/locale-zh_TW.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,7 @@
"volume.reverSnapshot.VOLUME NAME": "雲磁碟名稱:",
"volume.reverSnapshot.VOLUME TYPE": "雲磁碟類型:",
"volume.reverSnapshot.SNAPSHOT NAME": "快照名稱:",
"volume.reverSnapshot.SNAPSHOT UUID": "快照UUID:",
"volume.reverSnapshot.VM THE VOLUME ATTACHED": "雲主機雲磁碟附:",
"volume.reverSnapshot.HINT": "只有停止掛載雲主機時，雲磁碟可以被還原到快照它",
"volume.reverSnapshot.Cancel": "取消",
Expand Down Expand Up @@ -1610,6 +1611,11 @@
"volume.ts.Last Updated Date": "最近更新日期",
"volume.ts.DISK SIZE": "磁盤大小",
"volume.ts.Hypervisor": "虛擬化類型",
"volume.ts.See details": "查看詳細信息",
"volume.ts.Revert volume to this snapshot": "恢復雲盤到此快照",
"volume.ts.Backup": "備份",
"volume.ts.Delete From Backup Storage": "從備份存儲刪除",
"volume.ts.Delete": "刪除",
"l2Network.ts.NAME": "名稱",
"l2Network.ts.DESCRIPTION": "描述",
"l2Network.ts.PHYSICAL INTERFACE": "物理接口",
Expand Down
10 changes: 5 additions & 5 deletions zstack_dashboard/static/templates/volume/revertSnapshot.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ <h4 class="z-win-h4">{{ "volume.reverSnapshot.REVERT VOLUME TO SNAPSHOT" | trans

<table class="table z-table-borderless">
<tr>
<td><span class="z-label">{{ "volume.reverSnapshot.VOLUME NAME:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.reverSnapshot.VOLUME NAME" | translate }}</span></td>
<td><span class="z-description">{{volume.name}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.reverSnapshot.VOLUME TYPE:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.reverSnapshot.VOLUME TYPE" | translate }}</span></td>
<td><span class="z-description">{{volume.type}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.reverSnapshot.SNAPSHOT NAME:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.reverSnapshot.SNAPSHOT NAME" | translate }}</span></td>
<td><span>{{snapshot.name}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.reverSnapshot.SNAPSHOT UUID:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.reverSnapshot.SNAPSHOT UUID" | translate }}</span></td>
<td><span>{{snapshot.uuid}}</span></td>
</tr>
<tr ng-show="isVmInCorrectState()">
<td><span class="z-label">{{ "volume.reverSnapshot.VM THE VOLUME ATTACHED:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.reverSnapshot.VM THE VOLUME ATTACHED" | translate }}</span></td>
<td><span class="z-description">{{vm.name}}</span></td>
</tr>
</table>
Expand Down
30 changes: 15 additions & 15 deletions zstack_dashboard/static/templates/volume/snapshotDetails.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,63 +59,63 @@ <h1>{{model.current.name}}</h1>
<div class="panel-body">
<table class="table z-table-borderless">
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.DESCRIPTION:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.DESCRIPTION" | translate }}</span></td>
<td><span class="z-description">{{model.current.description}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.STATUS:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.STATUS" | translate }}</span></td>
<td><span class="{{model.current.statusLabel()}}">{{model.current.status}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.HYPERVISOR:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.HYPERVISOR" | translate }}</span></td>
<td><span>{{model.current.hypervisorType}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.TYPE:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.TYPE" | translate }}</span></td>
<td><span>{{model.current.type}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.SIZE:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.SIZE" | translate }}</span></td>
<td><span>{{model.current.size}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.VOLUME TYPE:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.VOLUME TYPE" | translate }}</span></td>
<td><span>{{model.current.volumeType}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.UUID:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.UUID" | translate }}</span></td>
<td><span>{{model.current.uuid}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.TREE UUID:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.TREE UUID" | translate }}</span></td>
<td>{{model.current.treeUuid}}</td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.PARENT UUID:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.PARENT UUID" | translate }}</span></td>
<td><a href="/#/volume/snapshot/{{model.current.parentUuid}}">{{model.current.parentUuid}}</a></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.PRIMARY STORAGE UUID:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.PRIMARY STORAGE UUID" | translate }}</span></td>
<td><a href="/#/primaryStorage/{{model.current.primaryStorageUuid}}">{{model.current.primaryStorageUuid}}</a></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.PRIMARY INSTALL PATH:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.PRIMARY INSTALL PATH" | translate }}</span></td>
<td><span>{{model.current.primaryStorageInstallPath}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.VOLUME UUID:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.VOLUME UUID" | translate }}</span></td>
<td><a href="/#/volume/{{model.current.volumeUuid}}">{{model.current.volumeUuid}}</a></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.IS LATEST IN TREE:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.IS LATEST IN TREE" | translate }}</span></td>
<td>{{model.current.latest}}</td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.CREATED DATE:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.CREATED DATE" | translate }}</span></td>
<td><span>{{model.current.createDate}}</span></td>
</tr>
<tr>
<td><span class="z-label">{{ "volume.snapshotDetails.LAST UPDATED DATE:" | translate }}</span></td>
<td><span class="z-label">{{ "volume.snapshotDetails.LAST UPDATED DATE" | translate }}</span></td>
<td><span>{{model.current.lastOpDate}}</span></td>
</tr>
</table>
Expand Down

0 comments on commit 5e3ea06

Please sign in to comment.