This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 7d0e285339655a399d5928ceff98d8eb8c65bed8 Merge: 87fa4ea 64c1492 Author: Marcus Christie <[email protected]> AuthorDate: Mon Nov 2 14:01:02 2020 -0500 Merge branch 'airavata-3381' into develop Dockerfile | 5 +- README.md | 4 +- django_airavata/apps/api/authentication.py | 9 - django_airavata/apps/auth/backends.py | 27 ++- django_airavata/apps/auth/utils.py | 4 +- .../ComputationalResourceSchedulingEditor.vue | 3 +- docs/assets/cms_default_theme.pdf | Bin 0 -> 5036749 bytes docs/dev/custom_django_app.md | 2 +- docs/dev/custom_output_view_provider.md | 42 ++++- docs/tutorial/data/npentane12diol.inp | 2 +- ...teways2019_tutorial.md => gateways_tutorial.md} | 202 ++++++++++----------- mkdocs.yml | 3 +- setup.py | 3 +- 13 files changed, 164 insertions(+), 142 deletions(-) diff --cc django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/ComputationalResourceSchedulingEditor.vue index f3611fa,777049e..cf5f313 --- 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 @@@ -252,10 -252,9 +252,9 @@@ export default // computeResourceOptions, reset it to null if ( this.resourceHostId !== null && - !newOptions.find(opt => opt.value === this.resourceHostId) + !newOptions.find((opt) => opt.value === this.resourceHostId) ) { this.resourceHostId = null; - this.computeResourceChanged(null); } // Apply preferred (most recently used) compute resource if ( @@@ -268,14 -267,16 +267,14 @@@ ) ) { this.resourceHostId = this.workspacePreferences.most_recent_compute_resource_id; - this.computeResourceChanged(null); } // If none selected, just pick the first one - if ( - this.resourceHostId === null && newOptions.length > 0 - ) { + if (this.resourceHostId === null && newOptions.length > 0) { this.resourceHostId = newOptions[0].value; } + this.computeResourceChanged(this.resourceHostId); }, - groupResourceProfileId: function(newGroupResourceProfileId) { + groupResourceProfileId: function (newGroupResourceProfileId) { this.loadApplicationDeployments( this.appModuleId, newGroupResourceProfileId
