Skip to content

Commit 0177630

Browse files
committed
Enhance user edits
- Avoid superuser edit by managers. - Allow all users to edit their own profile. Squashed commit of the following: commit 8942076 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Jun 17 23:22:11 2019 +0200 Improve user check commit 995cf7e Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Jun 17 23:06:19 2019 +0200 Remove superuser field on self-edit commit ea0f152 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Jun 17 23:03:47 2019 +0200 Manage groups in user form commit 71e63c4 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Jun 17 22:02:38 2019 +0200 Unify user creation and edit forms To allow changing the user password on edit we'll also extend the user creation form instead of having two different forms/pages to edit the user and the user password. commit 0d96a4b Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Jun 17 19:18:11 2019 +0200 Make messages commit 43d97d9 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Jun 17 19:16:14 2019 +0200 Fix username display commit 1db8d59 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Jun 17 18:42:22 2019 +0200 Clean-up user forms commit 5a4e709 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Jun 17 17:51:12 2019 +0200 Only show users breadcrumb to managers commit f173d44 Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Jun 17 17:51:06 2019 +0200 Allow all users to edit their own profile - Add profile link on header above logout. - Allow access to user edit form for self-editing. - Remove active and groups fields on self-edit. - Change superuser field removal and check. commit cb0fa0a Author: José Raddaoui Marín <raddaouimarin@gmail.com> Date: Mon Jun 17 16:31:05 2019 +0200 Avoid superuser edit by managers
1 parent 4d04817 commit 0177630

File tree

8 files changed

+191
-232
lines changed

8 files changed

+191
-232
lines changed

locale/en/LC_MESSAGES/django.po

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-06-13 14:36+0000\n"
11+
"POT-Creation-Date: 2019-06-17 17:17+0000\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,43 +17,43 @@ msgstr ""
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919

20-
#: scope/forms.py:15 scope/views.py:98 scope/views.py:342 scope/views.py:654
20+
#: scope/forms.py:14 scope/views.py:98 scope/views.py:337 scope/views.py:649
2121
msgid "Identifier"
2222
msgstr ""
2323

24-
#: scope/forms.py:19
24+
#: scope/forms.py:18
2525
msgid "Identifier does not match"
2626
msgstr ""
2727

28-
#: scope/forms.py:24 scope/forms.py:65
28+
#: scope/forms.py:23 scope/forms.py:50
2929
msgid "Administrator"
3030
msgstr ""
3131

32-
#: scope/forms.py:31 scope/forms.py:81 scope/views.py:159
32+
#: scope/forms.py:30 scope/forms.py:57 scope/views.py:159
3333
msgid "Groups"
3434
msgstr ""
3535

36-
#: scope/forms.py:32 scope/forms.py:82 scope/forms.py:159
36+
#: scope/forms.py:31 scope/forms.py:58 scope/forms.py:130
3737
msgid "Ctrl + Click to select multiple or unselect."
3838
msgstr ""
3939

40-
#: scope/forms.py:39 scope/forms.py:104
40+
#: scope/forms.py:77
4141
msgid "Password should be at least 8 characters long"
4242
msgstr ""
4343

44-
#: scope/forms.py:118
44+
#: scope/forms.py:87
4545
msgid "Password and password confirmation do not match"
4646
msgstr ""
4747

48-
#: scope/forms.py:158
48+
#: scope/forms.py:129
4949
msgid "Optional fields"
5050
msgstr ""
5151

52-
#: scope/forms.py:164
52+
#: scope/forms.py:135
5353
msgid "Hide empty fields"
5454
msgstr ""
5555

56-
#: scope/forms.py:166
56+
#: scope/forms.py:137
5757
msgid ""
5858
"Check to not display Dublin Core fields without data in the Collection and "
5959
"Folder view pages."
@@ -173,19 +173,19 @@ msgstr ""
173173
msgid "Incorrect date format for end date (%(date)s). Expected: yyyy-mm-dd."
174174
msgstr ""
175175

176-
#: scope/views.py:99 scope/views.py:343 scope/views.py:655
176+
#: scope/views.py:99 scope/views.py:338 scope/views.py:650
177177
msgid "Title"
178178
msgstr ""
179179

180-
#: scope/views.py:100 scope/views.py:344 scope/views.py:656
180+
#: scope/views.py:100 scope/views.py:339 scope/views.py:651
181181
msgid "Date"
182182
msgstr ""
183183

184-
#: scope/views.py:101 scope/views.py:345 scope/views.py:657
184+
#: scope/views.py:101 scope/views.py:340 scope/views.py:652
185185
msgid "Description"
186186
msgstr ""
187187

188-
#: scope/views.py:102 scope/views.py:346 scope/views.py:658
188+
#: scope/views.py:102 scope/views.py:341 scope/views.py:653
189189
msgid "Details"
190190
msgstr ""
191191

@@ -218,57 +218,57 @@ msgstr ""
218218
msgid "Edit"
219219
msgstr ""
220220

221-
#: scope/views.py:293 scope/views.py:405 templates/digitalfile.html:27
221+
#: scope/views.py:288 scope/views.py:400 templates/digitalfile.html:27
222222
#: templates/digitalfile.html:29
223223
msgid "Filepath"
224224
msgstr ""
225225

226-
#: scope/views.py:294 scope/views.py:406
226+
#: scope/views.py:289 scope/views.py:401
227227
msgid "Format"
228228
msgstr ""
229229

230-
#: scope/views.py:295 scope/views.py:407
230+
#: scope/views.py:290 scope/views.py:402
231231
msgid "Size"
232232
msgstr ""
233233

234-
#: scope/views.py:296 scope/views.py:408
234+
#: scope/views.py:291 scope/views.py:403
235235
msgid "Last modified"
236236
msgstr ""
237237

238-
#: scope/views.py:297
238+
#: scope/views.py:292
239239
msgid "Collection name"
240240
msgstr ""
241241

242-
#: scope/views.py:298 scope/views.py:409
242+
#: scope/views.py:293 scope/views.py:404
243243
msgid "File details"
244244
msgstr ""
245245

246-
#: scope/views.py:496
246+
#: scope/views.py:491
247247
msgid ""
248248
"A background process has been launched to extract and parse the METS file. "
249249
"After the process finishes and the interface is reloaded, a link to the "
250250
"Folder will show up in the Folders table below."
251251
msgstr ""
252252

253-
#: scope/views.py:529
253+
#: scope/views.py:524
254254
msgid ""
255255
"A background process has been launched to update the Collection metadata in "
256256
"the Elasticsearch index for the related Digital Files."
257257
msgstr ""
258258

259-
#: scope/views.py:565
259+
#: scope/views.py:560
260260
msgid ""
261261
"A background process has been launched to update the ancestors metadata in "
262262
"the Elasticsearch index for the related Digital Files."
263263
msgstr ""
264264

265-
#: scope/views.py:592
265+
#: scope/views.py:587
266266
msgid ""
267267
"A background process has been launched to delete the descendant Folders and "
268268
"Digital Files from the Elasticsearch indexes."
269269
msgstr ""
270270

271-
#: scope/views.py:624
271+
#: scope/views.py:619
272272
msgid ""
273273
"A background process has been launched to delete the descendant Digital "
274274
"Files from the Elasticsearch index."
@@ -333,7 +333,7 @@ msgstr ""
333333

334334
#: templates/collection.html:57 templates/collections.html:33
335335
#: templates/dip.html:76 templates/home.html:45 templates/orphan_dips.html:37
336-
#: templates/search.html:41 templates/users.html:36
336+
#: templates/search.html:41 templates/users.html:38
337337
msgid "See more"
338338
msgstr ""
339339

@@ -375,7 +375,7 @@ msgid "Content"
375375
msgstr ""
376376

377377
#: templates/content.html:24 templates/edit_collection.html:19
378-
#: templates/edit_dip.html:24 templates/edit_user.html:17
378+
#: templates/edit_dip.html:24 templates/edit_user.html:19
379379
#: templates/new_collection.html:17 templates/new_dip.html:17
380380
#: templates/new_user.html:15 templates/settings.html:22
381381
msgid "Submit"
@@ -539,11 +539,10 @@ msgid "Edit Folder"
539539
msgstr ""
540540

541541
#: templates/edit_user.html:6
542-
#, python-format
543-
msgid "User - %(user.username)s"
542+
msgid "User"
544543
msgstr ""
545544

546-
#: templates/edit_user.html:11 templates/new_user.html:9 templates/users.html:6
545+
#: templates/edit_user.html:12 templates/new_user.html:9 templates/users.html:6
547546
#: templates/users.html:9
548547
msgid "Users"
549548
msgstr ""
@@ -647,10 +646,14 @@ msgid "Add new Folder"
647646
msgstr ""
648647

649648
#: templates/includes/header.html:76
649+
msgid "Profile"
650+
msgstr ""
651+
652+
#: templates/includes/header.html:77
650653
msgid "Log out"
651654
msgstr ""
652655

653-
#: templates/includes/header.html:80
656+
#: templates/includes/header.html:81
654657
msgid "Log in"
655658
msgstr ""
656659

@@ -690,7 +693,7 @@ msgstr ""
690693
msgid "Add new DIP"
691694
msgstr ""
692695

693-
#: templates/new_user.html:5 templates/new_user.html:10 templates/users.html:42
696+
#: templates/new_user.html:5 templates/new_user.html:10 templates/users.html:46
694697
msgid "Add new User"
695698
msgstr ""
696699

0 commit comments

Comments
 (0)