Skip to content

Destroy VM with volumes UI rework#28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dhlaluku wants to merge 3 commits into from
Closed

Destroy VM with volumes UI rework #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ae2b6f
api: Add api arg validator for createProject api (#3097) (#3107)
anuragaw Dec 31, 2018
6a189a9
Remove redundant checkbox that controls the visibility of volumes to …
dhlaluku Dec 18, 2018
cb73d57
Change label from Volume IDs to Delete Volumes
Jan 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions api/src/main/java/org/apache/cloudstack/api/command/user/project/CreateProjectCmd.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,7 @@
// under the License.
package org.apache.cloudstack.api.command.user.project;

import org.apache.cloudstack.api.ApiArgValidator;
import org.apache.log4j.Logger;

import org.apache.cloudstack.api.APICommand;
Expand DownExpand Up@@ -51,10 +52,10 @@ public class CreateProjectCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "domain ID of the account owning a project")
private Long domainId;

@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "name of the project")
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, validations = ApiArgValidator.NotNullOrEmpty, description = "name of the project")
private String name;

@Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, required = true, description = "display text of the project")
@Parameter(name = ApiConstants.DISPLAY_TEXT, type = CommandType.STRING, required = true, validations = ApiArgValidator.NotNullOrEmpty, description = "display text of the project")
private String displayText;

// ///////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion ui/l10n/en.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1816,7 +1816,7 @@ var dictionary = {
"label.volume":"Volume",
"label.volume.details":"Volume details",
"label.volume.empty":"No volumes attached to this VM",
"label.volume.ids":"Volume ID's",
"label.volume.ids":"Delete Volumes",
"label.volume.limits":"Volume Limits",
"label.volume.migrated":"Volume migrated",
"label.volume.name":"Volume Name",
Expand Down
5 changes: 3 additions & 2 deletions ui/scripts/instances.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,13 +116,14 @@
volumes: {
label: 'label.delete.volumes',
isBoolean: true,
isChecked: false
isChecked: true,
isHidden: true,
},
volumeids: {
label: 'label.volume.ids',
dependsOn: 'volumes',
isBoolean: true,
isHidden: true,
isHidden: false,
emptyMessage: 'label.volume.empty',
multiDataArray: true,
multiData: function(args) {
Expand Down