You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/11/20 16:11:43 UTC
[airavata-django-portal] branch master updated (346649d -> 0e7993a)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 346649d AIRAVATA-2927 Workaround users/groups that share id
new ef31511 AIRAVATA-2927 Revert change to suggestion id, no longer needed
new 0e7993a AIRAVATA-2896 Fix saving sharing when default group auto added
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
django_airavata/static/common/js/components/ShareButton.vue | 1 +
.../static/common/js/components/SharedEntityEditor.vue | 10 ++--------
2 files changed, 3 insertions(+), 8 deletions(-)
[airavata-django-portal] 02/02: AIRAVATA-2896 Fix saving sharing
when default group auto added
Posted by ma...@apache.org.
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
commit 0e7993aaf5036e73c2a2ad12ce51a8fda1acf4f5
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Tue Nov 20 11:10:34 2018 -0500
AIRAVATA-2896 Fix saving sharing when default group auto added
---
django_airavata/static/common/js/components/ShareButton.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/django_airavata/static/common/js/components/ShareButton.vue b/django_airavata/static/common/js/components/ShareButton.vue
index f9ab3f9..4cc5f45 100644
--- a/django_airavata/static/common/js/components/ShareButton.vue
+++ b/django_airavata/static/common/js/components/ShareButton.vue
@@ -134,6 +134,7 @@ export default {
this.autoAddDefaultGatewayUsersGroup
) {
this.localSharedEntity.addGroup(this.defaultGatewayUsersGroup);
+ this.emitUnsavedEvent();
}
});
},
[airavata-django-portal] 01/02: AIRAVATA-2927 Revert change to
suggestion id, no longer needed
Posted by ma...@apache.org.
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
commit ef31511ad144ab671e272e9f3750bdd96207b9e6
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Tue Nov 20 11:09:52 2018 -0500
AIRAVATA-2927 Revert change to suggestion id, no longer needed
---
.../static/common/js/components/SharedEntityEditor.vue | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/django_airavata/static/common/js/components/SharedEntityEditor.vue b/django_airavata/static/common/js/components/SharedEntityEditor.vue
index 3a91941..31c137c 100644
--- a/django_airavata/static/common/js/components/SharedEntityEditor.vue
+++ b/django_airavata/static/common/js/components/SharedEntityEditor.vue
@@ -128,10 +128,7 @@ export default {
.filter(group => currentGroupIds.indexOf(group.id) < 0)
.map(group => {
return {
- // AIRAVATA-2927 Due to bad data, sometimes a user and a group will
- // have the same id. To prevent issues distinguish them by appending
- // the type of suggestion (-group)
- id: group.id + '-group',
+ id: group.id,
name: group.name,
type: "group"
};
@@ -148,10 +145,7 @@ export default {
.filter(user => currentUserIds.indexOf(user.airavataInternalUserId) < 0)
.map(user => {
return {
- // AIRAVATA-2927 Due to bad data, sometimes a user and a group will
- // have the same id. To prevent issues distinguish them by appending
- // the type of suggestion (-user)
- id: user.airavataInternalUserId + '-user',
+ id: user.airavataInternalUserId,
name:
user.firstName +
" " +