Commit 98401026 authored by Valeriy's avatar Valeriy

Issue #82 - Add owner to project

parent 819818ad
......@@ -87,6 +87,7 @@ class ProjectsController < ApplicationController
def create
@project = Project.new(params[:project])
@project.owner = current_user
Project.transaction do
@project.save!
......
......@@ -4,6 +4,7 @@ class Project < ActiveRecord::Base
has_many :issues, :dependent => :destroy
has_many :users_projects, :dependent => :destroy
has_many :users, :through => :users_projects
belongs_to :owner, :class_name => "User"
has_many :notes, :dependent => :destroy
validates :name,
......@@ -28,7 +29,7 @@ class Project < ActiveRecord::Base
after_destroy :destroy_gitosis_project
after_save :update_gitosis_project
attr_protected :private_flag
attr_protected :private_flag, :owner_id
scope :public_only, where(:private_flag => false)
......@@ -44,7 +45,6 @@ class Project < ActiveRecord::Base
read_attribute(:code).downcase.strip.gsub(' ', '')
end
def update_gitosis_project
Gitosis.new.configure do |c|
c.update_project(path, gitosis_writers)
......@@ -145,5 +145,6 @@ end
# updated_at :datetime
# private_flag :boolean default(TRUE), not null
# code :string(255)
# owner_id :integer
#
......@@ -9,6 +9,7 @@ class User < ActiveRecord::Base
has_many :users_projects, :dependent => :destroy
has_many :projects, :through => :users_projects
has_many :my_own_projects, :class_name => "Project", :foreign_key => :owner_id
has_many :keys, :dependent => :destroy
has_many :issues,
:foreign_key => :author_id,
......@@ -48,5 +49,6 @@ end
# updated_at :datetime
# name :string(255)
# admin :boolean default(FALSE), not null
# allowed_create_repo :boolean default(TRUE), not null
#
class AddOwnertoProject < ActiveRecord::Migration
def change
add_column :projects, :owner_id, :integer
end
end
......@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20111005193700) do
ActiveRecord::Schema.define(:version => 20111009101738) do
create_table "issues", :force => true do |t|
t.string "title"
......@@ -52,6 +52,7 @@ ActiveRecord::Schema.define(:version => 20111005193700) do
t.datetime "updated_at"
t.boolean "private_flag", :default => true, :null => false
t.string "code"
t.integer "owner_id"
end
create_table "users", :force => true do |t|
......
......@@ -122,5 +122,6 @@ end
# updated_at :datetime
# private_flag :boolean default(TRUE), not null
# code :string(255)
# owner_id :integer
#
......@@ -38,5 +38,6 @@ end
# updated_at :datetime
# name :string(255)
# admin :boolean default(FALSE), not null
# allowed_create_repo :boolean default(TRUE), not null
#
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