diff options
| author | Manush Dodunekov <manush@stendahls.se> | 2020-01-13 19:33:46 +0200 |
|---|---|---|
| committer | Antoine GIRARD <sapk@users.noreply.github.com> | 2020-01-13 18:33:46 +0100 |
| commit | 1751d5fcf200b7d78ec5543fa620174c69d2746a (patch) | |
| tree | dfc9584c2c60ede1fcef436de02dc66d28fd9647 /templates/admin/user | |
| parent | 0b3aaa61964faa85b8008b04487388cc362ab436 (diff) | |
| download | gitea-1751d5fcf200b7d78ec5543fa620174c69d2746a.tar.gz gitea-1751d5fcf200b7d78ec5543fa620174c69d2746a.zip | |
Restricted users (#6274)
* Restricted users (#4334): initial implementation
* Add User.IsRestricted & UI to edit it
* Pass user object instead of user id to places where IsRestricted flag matters
* Restricted users: maintain access rows for all referenced repos (incl public)
* Take logged in user & IsRestricted flag into account in org/repo listings, searches and accesses
* Add basic repo access tests for restricted users
Signed-off-by: Manush Dodunekov <manush@stendahls.se>
* Mention restricted users in the faq
Signed-off-by: Manush Dodunekov <manush@stendahls.se>
* Revert unnecessary change `.isUserPartOfOrg` -> `.IsUserPartOfOrg`
Signed-off-by: Manush Dodunekov <manush@stendahls.se>
* Remove unnecessary `org.IsOrganization()` call
Signed-off-by: Manush Dodunekov <manush@stendahls.se>
* Revert to an `int64` keyed `accessMap`
* Add type `userAccess`
* Add convenience func updateUserAccess()
* Turn accessMap into a `map[int64]userAccess`
Signed-off-by: Manush Dodunekov <manush@stendahls.se>
* or even better: `map[int64]*userAccess`
* updateUserAccess(): use tighter syntax as suggested by lafriks
* even tighter
* Avoid extra loop
* Don't disclose limited orgs to unauthenticated users
* Don't assume block only applies to orgs
* Use an array of `VisibleType` for filtering
* fix yet another thinko
* Ok - no need for u
* Revert "Ok - no need for u"
This reverts commit 5c3e886aabd5acd997a3b35687d322439732c200.
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'templates/admin/user')
| -rw-r--r-- | templates/admin/user/edit.tmpl | 6 | ||||
| -rw-r--r-- | templates/admin/user/list.tmpl | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index b2ec622ca2..da75cb5065 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -85,6 +85,12 @@ </div> <div class="inline field"> <div class="ui checkbox"> + <label><strong>{{.i18n.Tr "admin.users.is_restricted"}}</strong></label> + <input name="restricted" type="checkbox" {{if .User.IsRestricted}}checked{{end}}> + </div> + </div> + <div class="inline field"> + <div class="ui checkbox"> <label><strong>{{.i18n.Tr "admin.users.allow_git_hook"}}</strong></label> <input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}> </div> diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 538f9b7fed..72b7ccd191 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -21,6 +21,7 @@ <th>{{.i18n.Tr "email"}}</th> <th>{{.i18n.Tr "admin.users.activated"}}</th> <th>{{.i18n.Tr "admin.users.admin"}}</th> + <th>{{.i18n.Tr "admin.users.restricted"}}</th> <th>{{.i18n.Tr "admin.users.repos"}}</th> <th>{{.i18n.Tr "admin.users.created"}}</th> <th>{{.i18n.Tr "admin.users.last_login"}}</th> @@ -35,6 +36,7 @@ <td><span class="text truncate email">{{.Email}}</span></td> <td><i class="fa fa{{if .IsActive}}-check{{end}}-square-o"></i></td> <td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td> + <td><i class="fa fa{{if .IsRestricted}}-check{{end}}-square-o"></i></td> <td>{{.NumRepos}}</td> <td><span title="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</span></td> {{if .LastLoginUnix}} |