Commit 68aa88c9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix project creation without import

parent 8bf8c70c
...@@ -76,7 +76,9 @@ class Project < ActiveRecord::Base ...@@ -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 ...@@ -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")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment