Shiloh/githaven
Shiloh/githaven
1
0
Fork 1
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

#1301 "read-only" users

Browse Source
This commit is contained in:
Unknwon 2015-12-10 12:46:05 -05:00
parent 2a0bb1fa90
commit df5ed64cca
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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

8
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

4
modules/bindata/bindata.go
View File

File diff suppressed because one or more lines are too long