#2156 admin able to edit organization max repo creation

diff --git a/README.md b/README.md
index 85ec290e0ae086e890753190d5e5bdb39099bb17..80d6c2a33a5c1432c34501b153f3155d60a5625e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current version: 0.7.43 Beta
+##### Current version: 0.7.44 Beta
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|

diff --git a/cmd/web.go b/cmd/web.go
index ec8ccd51916755bafd2509e08d675abff05d6e31..13d7660c7648947b8f30f373aa957b2c4e7bf965 100644 (file)
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -258,10 +258,8 @@ func runWeb(ctx *cli.Context) {
 
                m.Group("/users", func() {
                        m.Get("", admin.Users)
-                       m.Get("/new", admin.NewUser)
-                       m.Post("/new", bindIgnErr(auth.AdminCrateUserForm{}), admin.NewUserPost)
-                       m.Get("/:userid", admin.EditUser)
-                       m.Post("/:userid", bindIgnErr(auth.AdminEditUserForm{}), admin.EditUserPost)
+                       m.Combo("/new").Get(admin.NewUser).Post(bindIgnErr(auth.AdminCrateUserForm{}), admin.NewUserPost)
+                       m.Combo("/:userid").Get(admin.EditUser).Post(bindIgnErr(auth.AdminEditUserForm{}), admin.EditUserPost)
                        m.Post("/:userid/delete", admin.DeleteUser)
                })
 
@@ -276,8 +274,7 @@ func runWeb(ctx *cli.Context) {
 
                m.Group("/auths", func() {
                        m.Get("", admin.Authentications)
-                       m.Get("/new", admin.NewAuthSource)
-                       m.Post("/new", bindIgnErr(auth.AuthenticationForm{}), admin.NewAuthSourcePost)
+                       m.Combo("/new").Get(admin.NewAuthSource).Post(bindIgnErr(auth.AuthenticationForm{}), admin.NewAuthSourcePost)
                        m.Combo("/:authid").Get(admin.EditAuthSource).
                                Post(bindIgnErr(auth.AuthenticationForm{}), admin.EditAuthSourcePost)
                        m.Post("/:authid/delete", admin.DeleteAuthSource)

diff --git a/gogs.go b/gogs.go
index d00b2991ef83c6cf9ee0fb8f89c49cf00e53bbba..d4bbefd4e67da7da5d80b21afc3400b2c2f4fc02 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -18,7 +18,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.7.43.1211 Beta"
+const APP_VER = "0.7.44.1211 Beta"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/modules/auth/org.go b/modules/auth/org.go
index 084ad43a8ab81016bfafbf14c474ca0ceb9c98b4..8af4ad55d816c89e3d8758d911f11aab14571162 100644 (file)
--- a/modules/auth/org.go
+++ b/modules/auth/org.go
@@ -25,11 +25,12 @@ func (f *CreateOrgForm) Validate(ctx *macaron.Context, errs binding.Errors) bind
 }
 
 type UpdateOrgSettingForm struct {
-       Name        string `binding:"Required;AlphaDashDot;MaxSize(35)" locale:"org.org_name_holder"`
-       FullName    string `binding:"MaxSize(100)"`
-       Description string `binding:"MaxSize(255)"`
-       Website     string `binding:"Url;MaxSize(100)"`
-       Location    string `binding:"MaxSize(50)"`
+       Name            string `binding:"Required;AlphaDashDot;MaxSize(35)" locale:"org.org_name_holder"`
+       FullName        string `binding:"MaxSize(100)"`
+       Description     string `binding:"MaxSize(255)"`
+       Website         string `binding:"Url;MaxSize(100)"`
+       Location        string `binding:"MaxSize(50)"`
+       MaxRepoCreation int
 }
 
 func (f *UpdateOrgSettingForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {

diff --git a/modules/bindata/bindata.go b/modules/bindata/bindata.go
index 6013e7dd19d86d3da903609bd466436fc1a346d1..c4ce602aa8b1104d54dd622bf31d386f25d053ef 100644 (file)
--- a/modules/bindata/bindata.go
+++ b/modules/bindata/bindata.go
@@ -4379,7 +4379,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
                return nil, err
        }
 
-       info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 48293, mode: os.FileMode(420), modTime: time.Unix(1449865728, 0)}
+       info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 48293, mode: os.FileMode(420), modTime: time.Unix(1449879514, 0)}
        a := &asset{bytes: bytes, info:  info}
        return a, nil
 }

diff --git a/public/css/gogs.css b/public/css/gogs.css
index 92d10ac734ec8083bcce9c486e904a6dd5685af5..2ff08242c84bd5cf14629ddf26d5017e6ec96763 100755 (executable)
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -2773,7 +2773,6 @@ footer .container .links > *:first-child {
   width: 50%!important;
 }
 .organization.options input {
-  width: 50%!important;
   min-width: 300px;
 }
 .organization.profile #org-avatar {

diff --git a/public/less/_organization.less b/public/less/_organization.less
index 4ad3b1dad0276945ba77ebbfdc8fcaa20c79a8b1..664c4642746057a58640c3b490e5e502987091ee 100644 (file)
--- a/public/less/_organization.less
+++ b/public/less/_organization.less
@@ -21,7 +21,6 @@
 
        &.options {
                input {
-                       width: 50%!important;
                        min-width: 300px;
                }
        }

diff --git a/routers/org/setting.go b/routers/org/setting.go
index d82891747a2a226fe7493cb040d4007c7ece651f..30f8cabe3ec3a05befc58e1be87bbedca39e6115 100644 (file)
--- a/routers/org/setting.go
+++ b/routers/org/setting.go
@@ -66,6 +66,10 @@ func SettingsPost(ctx *middleware.Context, form auth.UpdateOrgSettingForm) {
        org.Name = form.Name
        org.LowerName = strings.ToLower(form.Name)
 
+       if ctx.User.IsAdmin {
+               org.MaxRepoCreation = form.MaxRepoCreation
+       }
+
        org.FullName = form.FullName
        org.Description = form.Description
        org.Website = form.Website

diff --git a/templates/.VERSION b/templates/.VERSION
index 12ab796a5167fae8907539f277028613b91b8b8f..4aa4da533bdfc86318121a0860bbe4799dc5a4b0 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.7.43.1211 Beta
\ No newline at end of file
+0.7.44.1211 Beta
\ No newline at end of file

diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index ad4dd4c25ac8a3d1815813b5c62375489ca97c41..3280a6d70790f0de05c2b0872a6a895b6c7855a0 100644 (file)
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -92,6 +92,8 @@
                                                        </div>
                                                </div>
 
+                                               <div class="ui divider"></div>
+
                                                <div class="field">
                                                        <button class="ui green button">{{.i18n.Tr "admin.users.update_profile"}}</button>
                                                        <div class="ui red button delete-button" data-url="{{$.Link}}/delete" data-id="{{.User.Id}}">{{.i18n.Tr "admin.users.delete_account"}}</div>

diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
index 25ef4feac151fc01e6b0cf406e78cbf6e8a1ab67..670b05450c9061f1f64b511a290505a004ce6f30 100644 (file)
--- a/templates/admin/user/list.tmpl
+++ b/templates/admin/user/list.tmpl
@@ -35,7 +35,7 @@
                                                                        <td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td>
                                                                        <td>{{.NumRepos}}</td>
                                                                        <td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created }}</span></td>
-                                                                       <td><a href="{{AppSubUrl}}/admin/users/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td>
+                                                                       <td><a href="{{$.Link}}/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td>
                                                                </tr>
                                                        {{end}}
                                                </tbody>

diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index ce3610ae2f8bde26dd6ad8d40265910fc25ea377..64be63b7efd49f4a47f488cc68e6f5a607a6c197 100644 (file)
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -33,6 +33,16 @@
                                                        <input id="location" name="location"  value="{{.Org.Location}}">
                                                </div>
 
+                                               {{if .SignedUser.IsAdmin}}
+                                               <div class="ui divider"></div>
+
+                                               <div class="inline field {{if .Err_MaxRepoCreation}}error{{end}}">
+                                                       <label for="max_repo_creation">{{.i18n.Tr "admin.users.max_repo_creation"}}</label>
+                                                       <input id="max_repo_creation" name="max_repo_creation" type="number" value="{{.Org.MaxRepoCreation}}">
+                                                       <p class="help">{{.i18n.Tr "admin.users.max_repo_creation_desc"}}</p>
+                                               </div>
+                                               {{end}}
+
                                                <div class="field">
                                                        <button class="ui green button">{{$.i18n.Tr "org.settings.update_settings"}}</button>
                                                </div>