Add admin edit user

diff --git a/conf/app.ini b/conf/app.ini
index d4fdc0dcf7865cf517664caceb73e57571311150..985903a8e5271afb38325ddd3e3912023779fec0 100644 (file)
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -8,8 +8,8 @@ RUN_MODE = dev
 
 [repository]
 ROOT = /Users/%(RUN_USER)s/git/gogs-repositories
-LANG_IGNS = Google Go|C|Python|Ruby|C Sharp
-LICENSES = Apache v2 License|GPL v2|MIT License|Affero GPL|BSD (3-Clause) License
+LANG_IGNS = Google Go|C|C++|Python|Ruby|C Sharp
+LICENSES = Apache v2 License|GPL v2|MIT License|Affero GPL|Artistic License 2.0|BSD (3-Clause) License
 
 [server]
 DOMAIN = localhost

diff --git a/conf/gitignore/C++ b/conf/gitignore/C++
new file mode 100644 (file)
index 0000000..5a1b6ec
--- /dev/null
+++ b/conf/gitignore/C++
@@ -0,0 +1,13 @@
+# Compiled Object files
+*.slo
+*.lo
+*.o
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
\ No newline at end of file

diff --git a/conf/license/Artistic License 2.0 b/conf/license/Artistic License 2.0
new file mode 100644 (file)
index 0000000..b7c3809
--- /dev/null
+++ b/conf/license/Artistic License 2.0
@@ -0,0 +1,201 @@
+The Artistic License 2.0
+
+           Copyright (c) 2014
+
+     Everyone is permitted to copy and distribute verbatim copies
+      of this license document, but changing it is not allowed.
+
+Preamble
+
+This license establishes the terms under which a given free software
+Package may be copied, modified, distributed, and/or redistributed.
+The intent is that the Copyright Holder maintains some artistic
+control over the development of that Package while still keeping the
+Package available as open source and free software.
+
+You are always permitted to make arrangements wholly outside of this
+license directly with the Copyright Holder of a given Package.  If the
+terms of this license do not permit the full use that you propose to
+make of the Package, you should contact the Copyright Holder and seek
+a different licensing arrangement.
+
+Definitions
+
+    "Copyright Holder" means the individual(s) or organization(s)
+    named in the copyright notice for the entire Package.
+
+    "Contributor" means any party that has contributed code or other
+    material to the Package, in accordance with the Copyright Holder's
+    procedures.
+
+    "You" and "your" means any person who would like to copy,
+    distribute, or modify the Package.
+
+    "Package" means the collection of files distributed by the
+    Copyright Holder, and derivatives of that collection and/or of
+    those files. A given Package may consist of either the Standard
+    Version, or a Modified Version.
+
+    "Distribute" means providing a copy of the Package or making it
+    accessible to anyone else, or in the case of a company or
+    organization, to others outside of your company or organization.
+
+    "Distributor Fee" means any fee that you charge for Distributing
+    this Package or providing support for this Package to another
+    party.  It does not mean licensing fees.
+
+    "Standard Version" refers to the Package if it has not been
+    modified, or has been modified only in ways explicitly requested
+    by the Copyright Holder.
+
+    "Modified Version" means the Package, if it has been changed, and
+    such changes were not explicitly requested by the Copyright
+    Holder.
+
+    "Original License" means this Artistic License as Distributed with
+    the Standard Version of the Package, in its current version or as
+    it may be modified by The Perl Foundation in the future.
+
+    "Source" form means the source code, documentation source, and
+    configuration files for the Package.
+
+    "Compiled" form means the compiled bytecode, object code, binary,
+    or any other form resulting from mechanical transformation or
+    translation of the Source form.
+
+
+Permission for Use and Modification Without Distribution
+
+(1)  You are permitted to use the Standard Version and create and use
+Modified Versions for any purpose without restriction, provided that
+you do not Distribute the Modified Version.
+
+
+Permissions for Redistribution of the Standard Version
+
+(2)  You may Distribute verbatim copies of the Source form of the
+Standard Version of this Package in any medium without restriction,
+either gratis or for a Distributor Fee, provided that you duplicate
+all of the original copyright notices and associated disclaimers.  At
+your discretion, such verbatim copies may or may not include a
+Compiled form of the Package.
+
+(3)  You may apply any bug fixes, portability changes, and other
+modifications made available from the Copyright Holder.  The resulting
+Package will still be considered the Standard Version, and as such
+will be subject to the Original License.
+
+
+Distribution of Modified Versions of the Package as Source
+
+(4)  You may Distribute your Modified Version as Source (either gratis
+or for a Distributor Fee, and with or without a Compiled form of the
+Modified Version) provided that you clearly document how it differs
+from the Standard Version, including, but not limited to, documenting
+any non-standard features, executables, or modules, and provided that
+you do at least ONE of the following:
+
+    (a)  make the Modified Version available to the Copyright Holder
+    of the Standard Version, under the Original License, so that the
+    Copyright Holder may include your modifications in the Standard
+    Version.
+
+    (b)  ensure that installation of your Modified Version does not
+    prevent the user installing or running the Standard Version. In
+    addition, the Modified Version must bear a name that is different
+    from the name of the Standard Version.
+
+    (c)  allow anyone who receives a copy of the Modified Version to
+    make the Source form of the Modified Version available to others
+    under
+
+    (i)  the Original License or
+
+    (ii)  a license that permits the licensee to freely copy,
+    modify and redistribute the Modified Version using the same
+    licensing terms that apply to the copy that the licensee
+    received, and requires that the Source form of the Modified
+    Version, and of any works derived from it, be made freely
+    available in that license fees are prohibited but Distributor
+    Fees are allowed.
+
+
+Distribution of Compiled Forms of the Standard Version
+or Modified Versions without the Source
+
+(5)  You may Distribute Compiled forms of the Standard Version without
+the Source, provided that you include complete instructions on how to
+get the Source of the Standard Version.  Such instructions must be
+valid at the time of your distribution.  If these instructions, at any
+time while you are carrying out such distribution, become invalid, you
+must provide new instructions on demand or cease further distribution.
+If you provide valid instructions or cease distribution within thirty
+days after you become aware that the instructions are invalid, then
+you do not forfeit any of your rights under this license.
+
+(6)  You may Distribute a Modified Version in Compiled form without
+the Source, provided that you comply with Section 4 with respect to
+the Source of the Modified Version.
+
+
+Aggregating or Linking the Package
+
+(7)  You may aggregate the Package (either the Standard Version or
+Modified Version) with other packages and Distribute the resulting
+aggregation provided that you do not charge a licensing fee for the
+Package.  Distributor Fees are permitted, and licensing fees for other
+components in the aggregation are permitted. The terms of this license
+apply to the use and Distribution of the Standard or Modified Versions
+as included in the aggregation.
+
+(8) You are permitted to link Modified and Standard Versions with
+other works, to embed the Package in a larger work of your own, or to
+build stand-alone binary or bytecode versions of applications that
+include the Package, and Distribute the result without restriction,
+provided the result does not expose a direct interface to the Package.
+
+
+Items That are Not Considered Part of a Modified Version
+
+(9) Works (including, but not limited to, modules and scripts) that
+merely extend or make use of the Package, do not, by themselves, cause
+the Package to be a Modified Version.  In addition, such works are not
+considered parts of the Package itself, and are not subject to the
+terms of this license.
+
+
+General Provisions
+
+(10)  Any use, modification, and distribution of the Standard or
+Modified Versions is governed by this Artistic License. By using,
+modifying or distributing the Package, you accept this license. Do not
+use, modify, or distribute the Package, if you do not accept this
+license.
+
+(11)  If your Modified Version has been derived from a Modified
+Version made by someone other than you, you are nevertheless required
+to ensure that your Modified Version complies with the requirements of
+this license.
+
+(12)  This license does not grant you the right to use any trademark,
+service mark, tradename, or logo of the Copyright Holder.
+
+(13)  This license includes the non-exclusive, worldwide,
+free-of-charge patent license to make, have made, use, offer to sell,
+sell, import and otherwise transfer the Package with respect to any
+patent claims licensable by the Copyright Holder that are necessarily
+infringed by the Package. If you institute patent litigation
+(including a cross-claim or counterclaim) against any party alleging
+that the Package constitutes direct or contributory patent
+infringement, then this Artistic License to you shall terminate on the
+date that such litigation is filed.
+
+(14)  Disclaimer of Warranty:
+THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
+IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL
+LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

diff --git a/modules/auth/admin.go b/modules/auth/admin.go
new file mode 100644 (file)
index 0000000..eccab00
--- /dev/null
+++ b/modules/auth/admin.go
@@ -0,0 +1,55 @@
+// Copyright 2014 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package auth
+
+import (
+       "net/http"
+       "reflect"
+
+       "github.com/codegangsta/martini"
+
+       "github.com/gogits/binding"
+
+       "github.com/gogits/gogs/modules/base"
+       "github.com/gogits/gogs/modules/log"
+)
+
+type AdminEditUserForm struct {
+       Email    string `form:"email" binding:"Required;Email;MaxSize(50)"`
+       Website  string `form:"website" binding:"MaxSize(50)"`
+       Location string `form:"location" binding:"MaxSize(50)"`
+       Avatar   string `form:"avatar" binding:"Required;Email;MaxSize(50)"`
+       Active   string `form:"active"`
+       Admin    string `form:"admin"`
+}
+
+func (f *AdminEditUserForm) Name(field string) string {
+       names := map[string]string{
+               "Email":    "E-mail address",
+               "Website":  "Website",
+               "Location": "Location",
+               "Avatar":   "Gravatar Email",
+       }
+       return names[field]
+}
+
+func (f *AdminEditUserForm) Validate(errors *binding.Errors, req *http.Request, context martini.Context) {
+       if req.Method == "GET" || errors.Count() == 0 {
+               return
+       }
+
+       data := context.Get(reflect.TypeOf(base.TmplData{})).Interface().(base.TmplData)
+       data["HasError"] = true
+       AssignForm(f, data)
+
+       if len(errors.Overall) > 0 {
+               for _, err := range errors.Overall {
+                       log.Error("AdminEditUserForm.Validate: %v", err)
+               }
+               return
+       }
+
+       validate(errors, data, f)
+}

diff --git a/modules/auth/user.go b/modules/auth/user.go
index 491ec65acabae72e5369ec4955c61a1ae55af1bd..f8d8f661490f67bcf920987f4e780aa1bdd6735b 100644 (file)
--- a/modules/auth/user.go
+++ b/modules/auth/user.go
@@ -79,7 +79,7 @@ type UpdateProfileForm struct {
 
 func (f *UpdateProfileForm) Name(field string) string {
        names := map[string]string{
-               "Email":    "Email address",
+               "Email":    "E-mail address",
                "Website":  "Website",
                "Location": "Location",
                "Avatar":   "Gravatar Email",

diff --git a/routers/admin/user.go b/routers/admin/user.go
index 9dcc1499e3d5c912c8f80c2d9345162714fcc495..47eec5c9140c7f928de771274d4fc217dda38aa9 100644 (file)
--- a/routers/admin/user.go
+++ b/routers/admin/user.go
@@ -7,8 +7,11 @@ package admin
 import (
        "strings"
 
+       "github.com/codegangsta/martini"
+
        "github.com/gogits/gogs/models"
        "github.com/gogits/gogs/modules/auth"
+       "github.com/gogits/gogs/modules/base"
        "github.com/gogits/gogs/modules/log"
        "github.com/gogits/gogs/modules/middleware"
 )
@@ -61,3 +64,44 @@ func NewUser(ctx *middleware.Context, form auth.RegisterForm) {
 
        ctx.Redirect("/admin/users")
 }
+
+func EditUser(ctx *middleware.Context, params martini.Params, form auth.AdminEditUserForm) {
+       ctx.Data["Title"] = "Edit Account"
+
+       uid, err := base.StrTo(params["userid"]).Int()
+       if err != nil {
+               ctx.Handle(200, "admin.user.EditUser", err)
+               return
+       }
+
+       u, err := models.GetUserById(int64(uid))
+       if err != nil {
+               ctx.Handle(200, "admin.user.EditUser", err)
+               return
+       }
+
+       if ctx.Req.Method == "GET" {
+               ctx.Data["User"] = u
+               ctx.HTML(200, "admin/users/edit")
+               return
+       }
+
+       u.Email = form.Email
+       u.Website = form.Website
+       u.Location = form.Location
+       u.Avatar = base.EncodeMd5(form.Avatar)
+       u.AvatarEmail = form.Avatar
+       u.IsActive = form.Active == "on"
+       u.IsAdmin = form.Admin == "on"
+       if err := models.UpdateUser(u); err != nil {
+               ctx.Handle(200, "admin.user.EditUser", err)
+               return
+       }
+
+       ctx.Data["IsSuccess"] = true
+       ctx.Data["User"] = u
+       ctx.HTML(200, "admin/users/edit")
+
+       log.Trace("%s User profile updated by admin(%s): %s", ctx.Req.RequestURI,
+               ctx.User.LowerName, ctx.User.LowerName)
+}

diff --git a/routers/user/setting.go b/routers/user/setting.go
index f0c7a8a5b138c0b39d86f5c87140b723917dd54d..75adf2b81d0fbf9a5c63d7ce4bb07f390848e0fe 100644 (file)
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -46,6 +46,7 @@ func Setting(ctx *middleware.Context, form auth.UpdateProfileForm) {
 
        ctx.Data["IsSuccess"] = true
        ctx.HTML(200, "user/setting")
+
        log.Trace("%s User setting updated: %s", ctx.Req.RequestURI, ctx.User.LowerName)
 }
 

diff --git a/templates/admin/users.tmpl b/templates/admin/users.tmpl
index d82f04b812a3322addedd90c1ae6b468361bf8bf..dec5c18954df927ea051b06b823b2d0647f80af1 100644 (file)
--- a/templates/admin/users.tmpl
+++ b/templates/admin/users.tmpl
@@ -20,6 +20,7 @@
                             <th>Admin</th>
                             <th>Repos</th>
                             <th>Join</th>
+                            <th>Edit</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -32,6 +33,7 @@
                             <td><i class="fa fa{{if .IsAdmin}}-check{{end}}-square-o"></i></td>
                             <td>{{.NumRepos}}</td>
                             <td>{{DateFormat .Created "M d, Y"}}</td>
+                            <td><a href="/admin/users/{{.Id}}"><i class="fa fa-pencil-square-o"></i></a></td>
                         </tr>
                         {{end}}
                     </tbody>

diff --git a/templates/admin/users/edit.tmpl b/templates/admin/users/edit.tmpl
new file mode 100644 (file)
index 0000000..f7782fe
--- /dev/null
+++ b/templates/admin/users/edit.tmpl
@@ -0,0 +1,83 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="gogs-body" class="container" data-page="admin">
+    {{template "admin/nav" .}}
+    <div id="gogs-admin-container" class="col-md-9">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                Edit Account
+            </div>
+
+            <div class="panel-body">
+               <br/>
+                               <form action="/admin/users/{{.User.Id}}" method="post" class="form-horizontal">
+                                   {{if .IsSuccess}}<p class="alert alert-success">Your profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
+                       <input type="hidden" value="{{.User.Id}}" name="userId"/>
+                                       <div class="form-group">
+                                               <label class="col-md-3 control-label">Username: </label>
+                                               <label class="control-label">{{.User.Name}}</label>
+                                       </div>
+
+                                       <div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
+                                               <label class="col-md-3 control-label">Email<strong class="text-danger">*</strong></label>
+                                               <div class="col-md-7">
+                                                       <input name="email" class="form-control" placeholder="Type account's e-mail address" value="{{.User.Email}}" required="required">
+                                               </div>
+                                       </div>
+
+                       <div class="form-group">
+                           <label class="col-md-3 control-label">Website</label>
+                           <div class="col-md-7">
+                               <input name="website" class="form-control" placeholder="Type account's website URL" value="{{.User.Website}}">
+                           </div>
+                       </div>
+
+                       <div class="form-group">
+                           <label class="col-md-3 control-label">Location</label>
+                           <div class="col-md-7">
+                               <input name="location" class="form-control" placeholder="Type account's current location" value="{{.User.Location}}">
+                           </div>
+                       </div>
+
+                       <div class="form-group {{if .Err_Avatar}}has-error has-feedback{{end}}">
+                           <label class="col-md-3 control-label">Gravatar Email<strong class="text-danger">*</strong></label>
+                           <div class="col-md-7">
+                               <input name="avatar" class="form-control" placeholder="Type account's Gravatar e-mail address" required="required" value="{{.User.AvatarEmail}}">
+                           </div>
+                       </div>
+
+                       <div class="form-group">
+                                   <div class="col-md-7 col-md-offset-3">
+                                       <div class="checkbox">
+                                           <label>
+                                               <input type="checkbox" name="active" {{if .User.IsActive}}checked{{end}}>
+                                               <strong>This account has activated</strong>
+                                           </label>
+                                       </div>
+                                   </div>
+                       </div>
+
+                       <div class="form-group">
+                                   <div class="col-md-7 col-md-offset-3">
+                                       <div class="checkbox">
+                                           <label>
+                                               <input type="checkbox" name="admin" {{if .User.IsAdmin}}checked{{end}}>
+                                               <strong>This account has administor permisson</strong>
+                                           </label>
+                                       </div>
+                                   </div>
+                       </div>
+                                       <hr/>
+                                       <div class="form-group">
+                                           <div class="col-md-offset-3 col-md-6">
+                                               <button type="submit" class="btn btn-lg btn-primary btn-block">Update account profile</button>
+                                               <!-- <a type="button" href="/admin/users/{{.User.Id}}/delete" class="btn btn-lg btn-danger btn-block">Delete this account</a> -->
+                                           </div>
+                                       </div>
+                               </form>
+            </div>
+        </div>
+
+       </div>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file

diff --git a/templates/admin/users/new.tmpl b/templates/admin/users/new.tmpl
index bf59b16a80f1d5c7d26afaf1e584317385c0c590..01d976caa0ba1c3cccb8c3284b46c9a1b6cd4b84 100644 (file)
--- a/templates/admin/users/new.tmpl
+++ b/templates/admin/users/new.tmpl
@@ -13,35 +13,35 @@
                                <form action="/admin/users/new" method="post" class="form-horizontal">
                                    <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
                                        <div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
-                                               <label class="col-md-4 control-label">Username: </label>
-                                               <div class="col-md-6">
+                                               <label class="col-md-3 control-label">Username: </label>
+                                               <div class="col-md-7">
                                                        <input name="username" class="form-control" placeholder="Type account's username" value="{{.username}}" required="required">
                                                </div>
                                        </div>
 
                                        <div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
-                                               <label class="col-md-4 control-label">Email: </label>
-                                               <div class="col-md-6">
+                                               <label class="col-md-3 control-label">Email: </label>
+                                               <div class="col-md-7">
                                                        <input name="email" class="form-control" placeholder="Type account's e-mail address" value="{{.email}}" required="required" title="Email is not valid">
                                                </div>
                                        </div>
 
                                        <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
-                                               <label class="col-md-4 control-label">Password: </label>
-                                               <div class="col-md-6">
+                                               <label class="col-md-3 control-label">Password: </label>
+                                               <div class="col-md-7">
                                                        <input name="passwd" type="password" class="form-control" placeholder="Type account's password" required="required" title="Password must contain at least 6 characters">
                                                </div>
                                        </div>
 
                                        <div class="form-group {{if .Err_RetypePasswd}}has-error has-feedback{{end}}">
-                                               <label class="col-md-4 control-label">Re-type: </label>
-                                               <div class="col-md-6">
+                                               <label class="col-md-3 control-label">Re-type: </label>
+                                               <div class="col-md-7">
                                                        <input name="retypepasswd" type="password" class="form-control" placeholder="Re-type account's password" required="required" title="Re-type Password must be same to Password">
                                                </div>
                                        </div>
-
+                                       <hr/>
                                        <div class="form-group">
-                                           <div class="col-md-offset-4 col-md-6">
+                                           <div class="col-md-offset-3 col-md-7">
                                                <button type="submit" class="btn btn-lg btn-primary">Create new account</button>
                                            </div>
                                        </div>

diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl
index c38054f39bbf270030c6a90eea291a3aca9c7d9c..222ddd895b9b1c41cd0030e0ccf8b1815afe1434 100644 (file)
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@@ -5,8 +5,8 @@
     <div id="gogs-user-setting-container" class="col-md-9">
         <div id="gogs-setting-pwd">
             <h4>Account Profile</h4>
-            <form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting">{{if .IsSuccess}}
-                <p class="alert alert-success">Your profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
+            <form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting">
+                {{if .IsSuccess}}<p class="alert alert-success">Your profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
                 <p>Your Email will be public and used for Account related notifications and any web based operations made via the web.</p>
                 <div class="form-group">
                     <label class="col-md-2 control-label">Email</label>
@@ -29,7 +29,7 @@
                     </div>
                 </div>
 
-                <div class="form-group">
+                <div class="form-group {{if .Err_Avatar}}has-error has-feedback{{end}}">
                     <label class="col-md-2 control-label">Gravatar Email<strong class="text-danger">*</strong></label>
                     <div class="col-md-8">
                         <input type="text" name="avatar" class="form-control" placeholder="Type your Gravatar e-mail address" required="required" value="{{.Owner.AvatarEmail}}">

diff --git a/web.go b/web.go
index d6d78afa5d3e4bb3e847ee06e0b3f0c2eed0b37a..54aaab573beacae8655499c7128daf44fa12df5f 100644 (file)
--- a/web.go
+++ b/web.go
@@ -118,6 +118,7 @@ func runWeb(*cli.Context) {
        m.Get("/admin", reqSignIn, adminReq, admin.Dashboard)
        m.Get("/admin/users", reqSignIn, adminReq, admin.Users)
        m.Any("/admin/users/new", reqSignIn, adminReq, binding.BindIgnErr(auth.RegisterForm{}), admin.NewUser)
+       m.Any("/admin/users/:userid", reqSignIn, adminReq, binding.BindIgnErr(auth.AdminEditUserForm{}), admin.EditUser)
        m.Get("/admin/repos", reqSignIn, adminReq, admin.Repositories)
        m.Get("/admin/config", reqSignIn, adminReq, admin.Config)