Permalink
Browse files

Namespace model added. Migration to convert exit project/groups

  • Loading branch information...
1 parent ced242a commit e29ccece332e57c9fb6c532a3680e3b457e3a301 @randx randx committed Nov 22, 2012
View
@@ -10,26 +10,7 @@
# updated_at :datetime not null
#
-class Group < ActiveRecord::Base
- attr_accessible :code, :name, :owner_id
-
- has_many :projects
- belongs_to :owner, class_name: "User"
-
- validates :name, presence: true, uniqueness: true
- validates :code, presence: true, uniqueness: true
- validates :owner, presence: true
-
- delegate :name, to: :owner, allow_nil: true, prefix: true
-
- def self.search query
- where("name LIKE :query OR code LIKE :query", query: "%#{query}%")
- end
-
- def to_param
- code
- end
-
+class Group < Namespace
def users
User.joins(:users_projects).where(users_projects: {project_id: project_ids}).uniq
end
View
@@ -0,0 +1,20 @@
+class Namespace < ActiveRecord::Base
+ attr_accessible :code, :name, :owner_id
+
+ has_many :projects
+ belongs_to :owner, class_name: "User"
+
+ validates :name, presence: true, uniqueness: true
+ validates :code, presence: true, uniqueness: true
+ validates :owner, presence: true
+
+ delegate :name, to: :owner, allow_nil: true, prefix: true
+
+ def self.search query
+ where("name LIKE :query OR code LIKE :query", query: "%#{query}%")
+ end
+
+ def to_param
+ code
+ end
+end
View
@@ -32,7 +32,8 @@ class Project < ActiveRecord::Base
attr_accessor :error_code
# Relations
- belongs_to :group
+ belongs_to :group, foreign_key: "namespace_id", conditions: 'type = Group'
+ belongs_to :namespace
belongs_to :owner, class_name: "User"
has_many :users, through: :users_projects
has_many :events, dependent: :destroy
@@ -192,4 +193,12 @@ def services
def gitlab_ci?
gitlab_ci_service && gitlab_ci_service.active
end
+
+ def path_with_namespace
+ if namespace
+ namespace.code + '/' + path
+ else
+ path
+ end
+ end
end
@@ -0,0 +1,13 @@
+class ConvertGroupToNamespace < ActiveRecord::Migration
+ def up
+ rename_table 'groups', 'namespaces'
+ add_column :namespaces, :type, :string, null: true
+
+ # Migrate old groups
+ Namespace.update_all(type: 'Group')
+ end
+
+ def down
+ raise 'Rollback is not allowed'
+ end
+end
@@ -0,0 +1,5 @@
+class AddNamespaceIdToProject < ActiveRecord::Migration
+ def change
+ rename_column :projects, :group_id, :namespace_id
+ end
+end
View
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20121120113838) do
+ActiveRecord::Schema.define(:version => 20121122150932) do
create_table "events", :force => true do |t|
t.string "target_type"
@@ -25,14 +25,6 @@
t.integer "author_id"
end
- create_table "groups", :force => true do |t|
- t.string "name", :null => false
- t.string "code", :null => false
- t.integer "owner_id", :null => false
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- end
-
create_table "issues", :force => true do |t|
t.string "title"
t.integer "assignee_id"
@@ -88,6 +80,15 @@
t.datetime "updated_at", :null => false
end
+ create_table "namespaces", :force => true do |t|
+ t.string "name", :null => false
+ t.string "code", :null => false
+ t.integer "owner_id", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ t.string "type"
+ end
+
create_table "notes", :force => true do |t|
t.text "note"
t.string "noteable_id"
@@ -117,7 +118,7 @@
t.boolean "wall_enabled", :default => true, :null => false
t.boolean "merge_requests_enabled", :default => true, :null => false
t.boolean "wiki_enabled", :default => true, :null => false
- t.integer "group_id"
+ t.integer "namespace_id"
end
create_table "protected_branches", :force => true do |t|

0 comments on commit e29ccec

Please sign in to comment.