Browse Source

#1301 "read-only" users

tags/v0.9.99
Unknwon 8 years ago
parent
commit
df5ed64cca
3 changed files with 7 additions and 7 deletions
  1. 1
    1
      conf/locale/locale_en-US.ini
  2. 4
    4
      models/user.go
  3. 2
    2
      modules/bindata/bindata.go

+ 1
- 1
conf/locale/locale_en-US.ini View File

@@ -857,7 +857,7 @@ users.password_helper = Leave it empty to remain unchanged.
users.update_profile_success = Account profile has been updated successfully.
users.edit_account = Edit Account
users.max_repo_creation = Maximum Repository Creation Limit
users.max_repo_creation_desc = (Set 0 to use gloabl default limit)
users.max_repo_creation_desc = (Set -1 to use gloabl default limit)
users.is_activated = This account is activated
users.is_admin = This account has administrator permissions
users.allow_git_hook = This account has permissions to create Git hooks

+ 4
- 4
models/user.go View File

@@ -104,8 +104,8 @@ type User struct {
}

func (u *User) BeforeUpdate() {
if u.MaxRepoCreation < 0 {
u.MaxRepoCreation = 0
if u.MaxRepoCreation < -1 {
u.MaxRepoCreation = -1
}
}

@@ -125,14 +125,14 @@ func (u *User) HasForkedRepo(repoID int64) bool {
}

func (u *User) RepoCreationNum() int {
if u.MaxRepoCreation == 0 {
if u.MaxRepoCreation <= -1 {
return setting.Repository.MaxCreationLimit
}
return u.MaxRepoCreation
}

func (u *User) CanCreateRepo() bool {
if u.MaxRepoCreation == 0 {
if u.MaxRepoCreation <= -1 {
return u.NumRepos < setting.Repository.MaxCreationLimit
}
return u.NumRepos < u.MaxRepoCreation

+ 2
- 2
modules/bindata/bindata.go
File diff suppressed because it is too large
View File


Loading…
Cancel
Save