From commits-return-19675-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Fri Sep 14 21:40:12 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id CA21E180647 for ; Fri, 14 Sep 2018 21:40:10 +0200 (CEST) Received: (qmail 5599 invoked by uid 500); 14 Sep 2018 19:40:09 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 5590 invoked by uid 99); 14 Sep 2018 19:40:09 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2018 19:40:09 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 24C8382D69; Fri, 14 Sep 2018 19:40:09 +0000 (UTC) Date: Fri, 14 Sep 2018 19:40:09 +0000 To: "commits@airavata.apache.org" Subject: [airavata-django-portal] branch master updated: AIRAVATA-2876 Only allow admins to edit applications MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153695400906.16487.10694148676831400712@gitbox.apache.org> From: machristie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata-django-portal X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 51361a457a3df70e04b0d8172888fc0d5da4bfb8 X-Git-Newrev: b91e3489d931ba58cdeb9d78259df47a8b622edc X-Git-Rev: b91e3489d931ba58cdeb9d78259df47a8b622edc X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 b91e348 AIRAVATA-2876 Only allow admins to edit applications b91e348 is described below commit b91e3489d931ba58cdeb9d78259df47a8b622edc Author: Marcus Christie AuthorDate: Fri Sep 14 15:37:58 2018 -0400 AIRAVATA-2876 Only allow admins to edit applications --- .../applications/ApplicationDeploymentEditor.vue | 28 +++--- .../applications/ApplicationDeploymentsList.vue | 4 +- .../applications/ApplicationEditorContainer.vue | 5 +- .../applications/ApplicationInputFieldEditor.vue | 30 +++--- .../applications/ApplicationInterfaceEditor.vue | 18 ++-- .../applications/ApplicationModuleEditor.vue | 12 ++- .../applications/ApplicationOutputFieldEditor.vue | 19 ++-- .../applications/CommandObjectsEditor.vue | 14 +-- .../components/applications/SetEnvPathsEditor.vue | 12 ++- .../ComputeResourcePreferenceDashboard.vue | 106 +++++++++++---------- django_airavata/apps/api/serializers.py | 10 ++ .../js/models/ApplicationInterfaceDefinition.js | 1 + .../js/models/ApplicationModule.js | 15 +-- 13 files changed, 161 insertions(+), 113 deletions(-) diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue index 015f7f5..7d27ebb 100644 --- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue +++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue @@ -6,27 +6,29 @@ {{ name }} - + - + - + + :readonly="readonly" /> + :readonly="readonly" /> + :readonly="readonly" /> + - + :readonly="readonly" /> - + @@ -45,7 +47,7 @@
- + Save @@ -72,6 +74,10 @@ export default { deployment_id: { type: String, required: true + }, + readonly: { + type: Boolean, + default: false } }, components: { @@ -135,7 +141,7 @@ export default { return queue ? queue.maxRuntime : 0; }, defaultQueueAttributesDisabled() { - return !this.data.defaultQueueName; + return !this.data.defaultQueueName || this.readonly; } }, created() { diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentsList.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentsList.vue index 5c81732..8e856f2 100644 --- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentsList.vue +++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentsList.vue @@ -5,11 +5,11 @@