deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix project creation without import

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-11 23:13:21 +02:00
parent 8bf8c70c4b
commit 68aa88c9bd
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/project.rb
View file

@ -76,7 +76,9 @@ class Project < ActiveRecord::Base
validates_uniqueness_of :name, scope: :namespace_id validates_uniqueness_of :name, scope: :namespace_id
validates_uniqueness_of :path, scope: :namespace_id validates_uniqueness_of :path, scope: :namespace_id
validates :import_url, format: { with: URI::regexp(%w(http https)), message: "should be a valid url" } validates :import_url,
format: { with: URI::regexp(%w(http https)), message: "should be a valid url" },
if: :import?
validate :check_limit, :repo_name validate :check_limit, :repo_name
@ -147,6 +149,10 @@ class Project < ActiveRecord::Base
id && valid? id && valid?
end end
def import?
import_url.present?
end
def check_limit def check_limit
unless creator.can_create_project? unless creator.can_create_project?
errors[:base] << ("Your own projects limit is #{creator.projects_limit}! Please contact administrator to increase it") errors[:base] << ("Your own projects limit is #{creator.projects_limit}! Please contact administrator to increase it")