You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

128 lines
3.0 KiB

10 years ago
API add/generalize pagination (#9452) * paginate results * fixed deadlock * prevented breaking change * updated swagger * go fmt * fixed find topic * go mod tidy * go mod vendor with go1.13.5 * fixed repo find topics * fixed unit test * added Limit method to Engine struct; use engine variable when provided; fixed gitignore * use ItemsPerPage for default pagesize; fix GetWatchers, getOrgUsersByOrgID and GetStargazers; fix GetAllCommits headers; reverted some changed behaviors * set Page value on Home route * improved memory allocations * fixed response headers * removed logfiles * fixed import order * import order * improved swagger * added function to get models.ListOptions from context * removed pagesize diff on unit test * fixed imports * removed unnecessary struct field * fixed go fmt * scoped PR * code improvements * code improvements * go mod tidy * fixed import order * fixed commit statuses session * fixed files headers * fixed headers; added pagination for notifications * go mod tidy * go fmt * removed Private from user search options; added setting.UI.IssuePagingNum as default valeu on repo's issues list * Apply suggestions from code review Co-Authored-By: 6543 <6543@obermui.de> Co-Authored-By: zeripath <art27@cantab.net> * fixed build error * CI.restart() * fixed merge conflicts resolve * fixed conflicts resolve * improved FindTrackedTimesOptions.ToOptions() method * added backwards compatibility on ListReleases request; fixed issue tracked time ToSession * fixed build error; fixed swagger template * fixed swagger template * fixed ListReleases backwards compatibility * added page to user search route Co-authored-by: techknowlogick <matti@mdranta.net> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net>
4 years ago
10 years ago
10 years ago
API add/generalize pagination (#9452) * paginate results * fixed deadlock * prevented breaking change * updated swagger * go fmt * fixed find topic * go mod tidy * go mod vendor with go1.13.5 * fixed repo find topics * fixed unit test * added Limit method to Engine struct; use engine variable when provided; fixed gitignore * use ItemsPerPage for default pagesize; fix GetWatchers, getOrgUsersByOrgID and GetStargazers; fix GetAllCommits headers; reverted some changed behaviors * set Page value on Home route * improved memory allocations * fixed response headers * removed logfiles * fixed import order * import order * improved swagger * added function to get models.ListOptions from context * removed pagesize diff on unit test * fixed imports * removed unnecessary struct field * fixed go fmt * scoped PR * code improvements * code improvements * go mod tidy * fixed import order * fixed commit statuses session * fixed files headers * fixed headers; added pagination for notifications * go mod tidy * go fmt * removed Private from user search options; added setting.UI.IssuePagingNum as default valeu on repo's issues list * Apply suggestions from code review Co-Authored-By: 6543 <6543@obermui.de> Co-Authored-By: zeripath <art27@cantab.net> * fixed build error * CI.restart() * fixed merge conflicts resolve * fixed conflicts resolve * improved FindTrackedTimesOptions.ToOptions() method * added backwards compatibility on ListReleases request; fixed issue tracked time ToSession * fixed build error; fixed swagger template * fixed swagger template * fixed ListReleases backwards compatibility * added page to user search route Co-authored-by: techknowlogick <matti@mdranta.net> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net>
4 years ago
Better logging (#6038) (#6095) * Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
5 years ago
  1. // Copyright 2014 The Gogs Authors. All rights reserved.
  2. // Copyright 2020 The Gitea Authors.
  3. // Use of this source code is governed by a MIT-style
  4. // license that can be found in the LICENSE file.
  5. package org
  6. import (
  7. "code.gitea.io/gitea/models"
  8. "code.gitea.io/gitea/modules/base"
  9. "code.gitea.io/gitea/modules/context"
  10. "code.gitea.io/gitea/modules/log"
  11. "code.gitea.io/gitea/modules/setting"
  12. "github.com/unknwon/com"
  13. )
  14. const (
  15. // tplMembers template for organization members page
  16. tplMembers base.TplName = "org/member/members"
  17. )
  18. // Members render organization users page
  19. func Members(ctx *context.Context) {
  20. org := ctx.Org.Organization
  21. ctx.Data["Title"] = org.FullName
  22. ctx.Data["PageIsOrgMembers"] = true
  23. page := ctx.QueryInt("page")
  24. if page <= 1 {
  25. page = 1
  26. }
  27. var opts = models.FindOrgMembersOpts{
  28. OrgID: org.ID,
  29. PublicOnly: true,
  30. }
  31. if ctx.User != nil {
  32. isMember, err := ctx.Org.Organization.IsOrgMember(ctx.User.ID)
  33. if err != nil {
  34. ctx.Error(500, "IsOrgMember")
  35. return
  36. }
  37. opts.PublicOnly = !isMember && !ctx.User.IsAdmin
  38. }
  39. total, err := models.CountOrgMembers(opts)
  40. if err != nil {
  41. ctx.Error(500, "CountOrgMembers")
  42. return
  43. }
  44. pager := context.NewPagination(int(total), setting.UI.MembersPagingNum, page, 5)
  45. opts.ListOptions.Page = page
  46. opts.ListOptions.PageSize = setting.UI.MembersPagingNum
  47. members, membersIsPublic, err := models.FindOrgMembers(&opts)
  48. if err != nil {
  49. ctx.ServerError("GetMembers", err)
  50. return
  51. }
  52. ctx.Data["Page"] = pager
  53. ctx.Data["Members"] = members
  54. ctx.Data["MembersIsPublicMember"] = membersIsPublic
  55. ctx.Data["MembersIsUserOrgOwner"] = members.IsUserOrgOwner(org.ID)
  56. ctx.Data["MembersTwoFaStatus"] = members.GetTwoFaStatus()
  57. ctx.HTML(200, tplMembers)
  58. }
  59. // MembersAction response for operation to a member of organization
  60. func MembersAction(ctx *context.Context) {
  61. uid := com.StrTo(ctx.Query("uid")).MustInt64()
  62. if uid == 0 {
  63. ctx.Redirect(ctx.Org.OrgLink + "/members")
  64. return
  65. }
  66. org := ctx.Org.Organization
  67. var err error
  68. switch ctx.Params(":action") {
  69. case "private":
  70. if ctx.User.ID != uid && !ctx.Org.IsOwner {
  71. ctx.Error(404)
  72. return
  73. }
  74. err = models.ChangeOrgUserStatus(org.ID, uid, false)
  75. case "public":
  76. if ctx.User.ID != uid && !ctx.Org.IsOwner {
  77. ctx.Error(404)
  78. return
  79. }
  80. err = models.ChangeOrgUserStatus(org.ID, uid, true)
  81. case "remove":
  82. if !ctx.Org.IsOwner {
  83. ctx.Error(404)
  84. return
  85. }
  86. err = org.RemoveMember(uid)
  87. if models.IsErrLastOrgOwner(err) {
  88. ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
  89. ctx.Redirect(ctx.Org.OrgLink + "/members")
  90. return
  91. }
  92. case "leave":
  93. err = org.RemoveMember(ctx.User.ID)
  94. if models.IsErrLastOrgOwner(err) {
  95. ctx.Flash.Error(ctx.Tr("form.last_org_owner"))
  96. ctx.Redirect(ctx.Org.OrgLink + "/members")
  97. return
  98. }
  99. }
  100. if err != nil {
  101. log.Error("Action(%s): %v", ctx.Params(":action"), err)
  102. ctx.JSON(200, map[string]interface{}{
  103. "ok": false,
  104. "err": err.Error(),
  105. })
  106. return
  107. }
  108. if ctx.Params(":action") != "leave" {
  109. ctx.Redirect(ctx.Org.OrgLink + "/members")
  110. } else {
  111. ctx.Redirect(setting.AppSubURL + "/")
  112. }
  113. }