This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
The following commit(s) were added to refs/heads/master by this push:
new 4608271 Changes to work for users without a GroupResourceProfile, for
now
4608271 is described below
commit 4608271583d0586c400aa16e2fe5c7165e1c43ad
Author: Marcus Christie <machr...@iu.edu>
AuthorDate: Fri Feb 23 05:56:53 2018 -0500
Changes to work for users without a GroupResourceProfile, for now
---
.../experiment/ComputationalResourceSchedulingEditor.vue | 14 +++++++-------
.../js/components/experiment/QueueSettingsEditor.vue | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git
a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ComputationalResourceSchedulingEditor.vue
b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ComputationalResourceSchedulingEditor.vue
index c25cad3..e6592ce 100644
---
a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ComputationalResourceSchedulingEditor.vue
+++
b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ComputationalResourceSchedulingEditor.vue
@@ -94,18 +94,18 @@ export default {
return this.loadingCount > 0;
},
selectedComputeResourcePolicy: function() {
- if (this.groupResourceProfile === null) {
+ if (this.selectedGroupResourceProfile === null) {
return null;
}
- return this.groupResourceProfile.computeResourcePolicies.find(crp
=> {
+ return
this.selectedGroupResourceProfile.computeResourcePolicies.find(crp => {
return crp.computeResourceId ===
this.localComputationalResourceScheduling.resourceHostId;
});
},
batchQueueResourcePolicies: function() {
- if (this.groupResourceProfile === null) {
+ if (this.selectedGroupResourceProfile === null) {
return null;
}
- return
this.groupResourceProfile.batchQueueResourcePolicies.filter(bqrp => {
+ return
this.selectedGroupResourceProfile.batchQueueResourcePolicies.filter(bqrp => {
return bqrp.computeResourceId ===
this.localComputationalResourceScheduling.resourceHostId;
});
}
@@ -142,17 +142,17 @@ export default {
this.groupResourceProfiles = groupResourceProfiles;
if (this.groupResourceProfiles &&
this.groupResourceProfiles.length > 0) {
// Just pick the first one for now
- this.groupResourceProfile =
this.groupResourceProfiles[0];
+ this.selectedGroupResourceProfile =
this.groupResourceProfiles[0];
}
})
.then(()=> {this.loadingCount--;}, () =>
{this.loadingCount--;});
},
isComputeHostInGroupResourceProfile: function(computeHostId) {
// TODO: for now don't require a GroupResourceProfile
- if (this.groupResourceProfile === null) {
+ if (this.selectedGroupResourceProfile === null) {
return true;
}
- return this.groupResourceProfile.computePreferences.some(cp => {
+ return
this.selectedGroupResourceProfile.computePreferences.some(cp => {
return cp.computeResourceId === computeHostId;
})
},
diff --git
a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
index 5dbe3f9..3829958 100644
---
a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
+++
b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/QueueSettingsEditor.vue
@@ -172,9 +172,9 @@ export default {
queueChanged: function(queueName) {
const queueDefault = this.queueDefaults.find(queue =>
queue.queueName === queueName);
- this.localComputationalResourceScheduling.totalCPUCount =
this.getDefaultCPUCount(defaultQueue);
- this.localComputationalResourceScheduling.nodeCount =
this.getDefaultNodeCount(defaultQueue);
- this.localComputationalResourceScheduling.wallTimeLimit =
this.getDefaultWalltime(defaultQueue);
+ this.localComputationalResourceScheduling.totalCPUCount =
this.getDefaultCPUCount(queueDefault);
+ this.localComputationalResourceScheduling.nodeCount =
this.getDefaultNodeCount(queueDefault);
+ this.localComputationalResourceScheduling.wallTimeLimit =
this.getDefaultWalltime(queueDefault);
this.emitValueChanged();
},
emitValueChanged: function() {
--
To stop receiving notification emails like this one, please contact
machris...@apache.org.
