Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added link to password change into the admin #1462

Merged
merged 3 commits into from Mar 2, 2018
Merged

Added link to password change into the admin #1462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1be6c9a
Added link to password change into the admin
noirbizarre Feb 26, 2018
1a04302
Extract translations
noirbizarre Feb 26, 2018
de83409
Merge branch 'master' into password-management
noirbizarre Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@
- Update card components to make them more consistent [#1383](https://github.com/opendatateam/udata/pull/1383) [#1460](https://github.com/opendatateam/udata/pull/1460)
- Switch from OAuthlib/Flask-OUAhtlib to Authlib and support all grants type as well as token revocation [#1434](https://github.com/opendatateam/udata/pull/1434)
- Fix completion/suggestion unicode handling [#1452](https://github.com/opendatateam/udata/pull/1452)
- Added a link to change password into the admin [#1462](https://github.com/opendatateam/udata/pull/1462)

## 1.2.11 (2018-02-05)

Expand Down
2 changes: 2 additions & 0 deletions js/locales/udata.en.json
View file
Open in desktop
Expand Up @@ -48,6 +48,7 @@
"Cancel": "Cancel",
"Center the full picture": "Center the full picture",
"Certified public service": "Certified public service",
"Change password": "Change password",
"Changes saved": "Changes saved",
"Checksum": "Checksum",
"Choose under which identity you want to publish": "Choose under which identity you want to publish",
Expand Down Expand Up @@ -88,6 +89,7 @@
"Date": "Date",
"Date should be after start date": "Date should be after start date",
"Delete": "Delete",
"Delete profile": "Delete profile",
"Deleted": "Deleted",
"Describe your community resource": "Describe your community resource",
"Describe your dataset": "Describe your dataset",
Expand Down
9 changes: 8 additions & 1 deletion js/views/me.vue
View file
Open in desktop
Expand Up @@ -46,8 +46,12 @@ export default {
label: this._('Edit'),
icon: 'edit',
method: this.edit
}, {
label: this._('Change password'),
icon: 'key',
method: this.change_password
}].concat(config.is_delete_me_enabled ? [{
label: this._('Delete'),
label: this._('Delete profile'),
icon: 'trash',
method: this.confirm_delete
}] : []),
Expand Down Expand Up @@ -81,6 +85,9 @@ export default {
this._handler.remove();
},
methods: {
change_password() {
document.location = '/change';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This won't work if udata is served from a subfolder, does it?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes but right now, it already can't be served in a subfolder because this pattern is already used in many places.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok :-)

},
confirm_delete() {
this.$root.$modal(
require('components/user/delete-me-modal.vue'),
Expand Down
46 changes: 23 additions & 23 deletions udata/translations/udata.pot
View file
Open in desktop
Expand Up @@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: udata 1.3.0.dev0\n"
"Report-Msgid-Bugs-To: i18n@opendata.team\n"
"POT-Creation-Date: 2018-02-21 12:45+0100\n"
"PO-Revision-Date: 2018-02-21 12:45+0100\n"
"POT-Creation-Date: 2018-02-26 10:54+0100\n"
"PO-Revision-Date: 2018-02-26 10:54+0100\n"
"Last-Translator: Open Data Team <i18n@opendata.team>\n"
"Language: en\n"
"Language-Team: Open Data Team <i18n@opendata.team>\n"
Expand Down Expand Up @@ -125,7 +125,7 @@ msgid "Description"
msgstr ""

#: udata/core/dataset/forms.py:30 udata/core/reuse/forms.py:27
#: udata/templates/reuse/card.html:32 udata/templates/reuse/display.html:183
#: udata/templates/reuse/card.html:27 udata/templates/reuse/display.html:183
#: udata/templates/reuse/search-labels.html:6
#: udata/templates/reuse/search-panel.html:6
#: udata/templates/reuse/search-result.html:18
Expand Down Expand Up @@ -199,7 +199,7 @@ msgstr ""
msgid "Expected frequency date"
msgstr ""

#: udata/core/dataset/forms.py:88 udata/templates/dataset/card.html:46
#: udata/core/dataset/forms.py:88 udata/templates/dataset/card.html:41
#: udata/templates/dataset/display.html:213
#: udata/templates/dataset/search-labels.html:15
#: udata/templates/dataset/search-panel.html:13
Expand Down Expand Up @@ -251,7 +251,7 @@ msgstr ""

#: udata/core/dataset/metrics.py:23 udata/core/organization/metrics.py:34
#: udata/core/site/metrics.py:53 udata/core/site/views.py:134
#: udata/core/user/metrics.py:43 udata/templates/dataset/card.html:34
#: udata/core/user/metrics.py:43 udata/templates/dataset/card.html:29
#: udata/templates/dataset/display.html:385 udata/templates/dataset/list.html:43
#: udata/templates/dataset/search-labels.html:25
#: udata/templates/organization/list.html:38
Expand Down Expand Up @@ -1610,7 +1610,7 @@ msgstr ""
msgid "search"
msgstr ""

#: udata/templates/organization/card.html:25
#: udata/templates/organization/card.html:21
#: udata/templates/organization/display.html:49
#: udata/templates/organization/display_base.html:58
#: udata/templates/organization/search-result.html:23
Expand All @@ -1622,7 +1622,7 @@ msgid_plural "%(num)d datasets"
msgstr[0] ""
msgstr[1] ""

#: udata/templates/organization/card.html:31
#: udata/templates/organization/card.html:27
#: udata/templates/organization/display.html:53
#: udata/templates/organization/display_base.html:87
#: udata/templates/organization/search-result.html:32
Expand Down Expand Up @@ -1657,10 +1657,10 @@ msgstr ""
msgid "Badge"
msgstr ""

#: udata/templates/dataset/card.html:38 udata/templates/dataset/list.html:44
#: udata/templates/organization/card.html:34 udata/templates/reuse/card.html:41
#: udata/templates/dataset/card.html:33 udata/templates/dataset/list.html:44
#: udata/templates/organization/card.html:30 udata/templates/reuse/card.html:36
#: udata/templates/search.html:77 udata/templates/search.html:91
#: udata/templates/topic/datasets.html:37 udata/templates/user/card.html:33
#: udata/templates/topic/datasets.html:37 udata/templates/user/card.html:28
msgid "Stars"
msgstr ""

Expand Down Expand Up @@ -1767,15 +1767,19 @@ msgstr ""
msgid "OAuth Authentication Error"
msgstr ""

#: udata/templates/dataset/card.html:29
#: udata/templates/dataset/add-reuse-card.html:6
msgid "Add a reuse"
msgstr ""

#: udata/templates/dataset/card.html:24
msgid "Number of resources"
msgstr ""

#: udata/templates/dataset/card.html:54 udata/templates/dataset/display.html:262
#: udata/templates/dataset/card.html:49 udata/templates/dataset/display.html:262
msgid "Territorial coverage"
msgstr ""

#: udata/templates/dataset/card.html:62 udata/templates/dataset/display.html:254
#: udata/templates/dataset/card.html:57 udata/templates/dataset/display.html:254
#: udata/templates/dataset/search-result.html:89
msgid "Territorial coverage granularity"
msgstr ""
Expand Down Expand Up @@ -1885,10 +1889,6 @@ msgid ""
msgstr ""

#: udata/templates/dataset/display.html:403
msgid "Add a reuse"
msgstr ""

#: udata/templates/dataset/display.html:411
msgid ""
"You reused these data and published an article, a computer graphics, or an "
"application?\n"
Expand Down Expand Up @@ -2282,13 +2282,13 @@ msgstr ""
msgid "Confirm now"
msgstr ""

#: udata/templates/organization/card.html:23
#: udata/templates/organization/card.html:19
#: udata/templates/organization/search-result.html:21
#: udata/templates/user/card.html:22
#: udata/templates/user/card.html:17
msgid "Number of datasets"
msgstr ""

#: udata/templates/organization/card.html:29 udata/templates/user/card.html:28
#: udata/templates/organization/card.html:25 udata/templates/user/card.html:23
msgid "Number of reuses"
msgstr ""

Expand Down Expand Up @@ -2487,7 +2487,7 @@ msgstr ""
msgid "Photo credit"
msgstr ""

#: udata/templates/post/display.html:56 udata/templates/reuse/card.html:46
#: udata/templates/post/display.html:56 udata/templates/reuse/card.html:41
#, python-format
msgid "Published on %(date)s"
msgstr ""
Expand Down Expand Up @@ -2537,11 +2537,11 @@ msgstr ""
msgid "Read more"
msgstr ""

#: udata/templates/reuse/card.html:36
#: udata/templates/reuse/card.html:31
msgid "Number of datasets used"
msgstr ""

#: udata/templates/reuse/card.html:53
#: udata/templates/reuse/card.html:48
#, python-format
msgid "Created by %(user)s"
msgstr ""
Expand Down