diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-10-25 01:36:19 +0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2017-10-24 20:36:19 +0300 |
| commit | 6eeadb2082193f8e3dc5269dfc6da2daef7eb6a1 (patch) | |
| tree | d28d3be3451194e98a5c01097347e7eebdb6393f /routers/admin | |
| parent | 03900303a9500b33b33ff03fd6dd325147a1117e (diff) | |
| download | gitea-6eeadb2082193f8e3dc5269dfc6da2daef7eb6a1.tar.gz gitea-6eeadb2082193f8e3dc5269dfc6da2daef7eb6a1.zip | |
Hide unactive on explore users and some refactors (#2741)
* hide unactive on explore users and some refactors
* fix test for removed Organizations
* fix test for removed Organizations
* fix imports
* fix logic bug
* refactor the toConds
* Rename TestOrganizations to TestSearchUsers and add tests for users
* fix other tests
* fix other tests
* fix watchers tests
* fix comments and remove unused code
Diffstat (limited to 'routers/admin')
| -rw-r--r-- | routers/admin/orgs.go | 7 | ||||
| -rw-r--r-- | routers/admin/users.go | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/routers/admin/orgs.go b/routers/admin/orgs.go index eeb9002bc2..c556d3fcf5 100644 --- a/routers/admin/orgs.go +++ b/routers/admin/orgs.go @@ -22,11 +22,8 @@ func Organizations(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminOrganizations"] = true - routers.RenderUserSearch(ctx, &routers.UserSearchOptions{ + routers.RenderUserSearch(ctx, &models.SearchUserOptions{ Type: models.UserTypeOrganization, - Counter: models.CountOrganizations, - Ranger: models.Organizations, PageSize: setting.UI.Admin.OrgPagingNum, - TplName: tplOrgs, - }) + }, tplOrgs) } diff --git a/routers/admin/users.go b/routers/admin/users.go index d480029143..c22accc202 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -30,13 +30,10 @@ func Users(ctx *context.Context) { ctx.Data["PageIsAdmin"] = true ctx.Data["PageIsAdminUsers"] = true - routers.RenderUserSearch(ctx, &routers.UserSearchOptions{ + routers.RenderUserSearch(ctx, &models.SearchUserOptions{ Type: models.UserTypeIndividual, - Counter: models.CountUsers, - Ranger: models.Users, PageSize: setting.UI.Admin.UserPagingNum, - TplName: tplUsers, - }) + }, tplUsers) } // NewUser render adding a new user page |