From 68aa88c9bdacc16b74b486062eea9cdd056fab16 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 11 Feb 2013 23:13:21 +0200 Subject: [PATCH] Fix project creation without import --- app/models/project.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/project.rb b/app/models/project.rb index 16f189fd..8c747743 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -76,7 +76,9 @@ class Project < ActiveRecord::Base validates_uniqueness_of :name, 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 @@ -147,6 +149,10 @@ class Project < ActiveRecord::Base id && valid? end + def import? + import_url.present? + end + def check_limit unless creator.can_create_project? errors[:base] << ("Your own projects limit is #{creator.projects_limit}! Please contact administrator to increase it")