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 2022/07/08 19:21:30 UTC
[airavata-django-portal] 01/01: Merge branch 'AIRAVATA-3562' into develop
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 fb5dc00cf113399c7a820020618ce76e9a0e26a5
Merge: 3de3e969 8a516305
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Fri Jul 8 15:20:51 2022 -0400
Merge branch 'AIRAVATA-3562' into develop
django_airavata/apps/admin/apps.py | 2 +-
.../users/ExtendedUserProfileContainer.vue | 120 +++++++
.../components/users/ExtendedUserProfilePanel.vue | 82 +++++
.../src/components/users/UserDetailsContainer.vue | 3 +
.../components/users/UserManagementContainer.vue | 5 +
.../ExtendedUserProfileFieldEditor.vue | 366 ++++++++++++++++++++
.../admin/static/django_airavata_admin/src/main.js | 4 +
.../static/django_airavata_admin/src/router.js | 6 +
.../django_airavata_admin/src/store/index.js | 16 +
.../src/store/modules/extendedUserProfile.js | 190 ++++++++++
django_airavata/apps/admin/urls.py | 1 +
django_airavata/apps/admin/views.py | 6 +
.../api/static/django_airavata_api/js/index.js | 12 +
.../js/models/ExtendedUserProfileField.js | 76 ++++
.../js/models/ExtendedUserProfileFieldChoice.js | 24 ++
.../js/models/ExtendedUserProfileFieldLink.js | 31 ++
.../js/models/ExtendedUserProfileValue.js | 46 +++
.../static/django_airavata_api/js/models/User.js | 3 +-
.../django_airavata_api/js/service_config.js | 23 ++
.../js/services/ServiceFactory.js | 3 +
django_airavata/apps/api/view_utils.py | 5 +
django_airavata/apps/auth/middleware.py | 10 +-
...ld_extendeduserprofilefieldlink_extendeduser.py | 107 ++++++
.../auth/migrations/0015_auto_20220329_1708.py | 72 ++++
.../0016_extendeduserprofilefield_required.py | 18 +
.../auth/migrations/0017_auto_20220616_1831.py | 55 +++
django_airavata/apps/auth/models.py | 242 +++++++++++++
django_airavata/apps/auth/package.json | 3 +-
django_airavata/apps/auth/serializers.py | 271 ++++++++++++++-
.../js/components/ExtendedUserProfileEditor.vue | 57 +++
.../ExtendedUserProfileMultiChoiceValueEditor.vue | 157 +++++++++
.../ExtendedUserProfileSingleChoiceValueEditor.vue | 159 +++++++++
.../ExtendedUserProfileTextValueEditor.vue | 63 ++++
...ExtendedUserProfileUserAgreementValueEditor.vue | 81 +++++
.../components/ExtendedUserProfileValueEditor.vue | 47 +++
.../js/components/UserProfileEditor.vue | 104 +++---
.../js/containers/UserProfileContainer.vue | 138 ++++----
.../django_airavata_auth/js/entry-user-profile.js | 11 +-
.../static/django_airavata_auth/js/store/index.js | 18 +
.../js/store/modules/extendedUserProfile.js | 188 ++++++++++
.../js/store/modules/userProfile.js | 64 ++++
django_airavata/apps/auth/tests/test_middleware.py | 123 +++++++
django_airavata/apps/auth/tests/test_models.py | 383 +++++++++++++++++++++
django_airavata/apps/auth/urls.py | 2 +
django_airavata/apps/auth/utils.py | 36 +-
django_airavata/apps/auth/views.py | 70 +++-
django_airavata/apps/auth/yarn.lock | 5 +
.../static/common/js/errors/vuelidateHelpers.js | 14 +
django_airavata/static/common/js/index.js | 2 +
.../static/common/js/mixins/ValidationParent.js | 30 ++
django_airavata/static/common/scss/main.scss | 5 +
51 files changed, 3436 insertions(+), 123 deletions(-)