Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
0cc6c7a3
Commit
0cc6c7a3
authored
Oct 09, 2011
by
Valera Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #82 - Add owner to project
parent
9aeb9ec5
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
3 deletions
+15
-3
app/controllers/projects_controller.rb
app/controllers/projects_controller.rb
+1
-0
app/models/project.rb
app/models/project.rb
+3
-2
app/models/user.rb
app/models/user.rb
+2
-0
db/migrate/20111009101738_add_ownerto_project.rb
db/migrate/20111009101738_add_ownerto_project.rb
+5
-0
db/schema.rb
db/schema.rb
+2
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-0
spec/models/user_spec.rb
spec/models/user_spec.rb
+1
-0
No files found.
app/controllers/projects_controller.rb
View file @
0cc6c7a3
...
@@ -87,6 +87,7 @@ class ProjectsController < ApplicationController
...
@@ -87,6 +87,7 @@ class ProjectsController < ApplicationController
def
create
def
create
@project
=
Project
.
new
(
params
[
:project
])
@project
=
Project
.
new
(
params
[
:project
])
@project
.
owner
=
current_user
Project
.
transaction
do
Project
.
transaction
do
@project
.
save!
@project
.
save!
...
...
app/models/project.rb
View file @
0cc6c7a3
...
@@ -4,6 +4,7 @@ class Project < ActiveRecord::Base
...
@@ -4,6 +4,7 @@ class Project < ActiveRecord::Base
has_many
:issues
,
:dependent
=>
:destroy
has_many
:issues
,
:dependent
=>
:destroy
has_many
:users_projects
,
:dependent
=>
:destroy
has_many
:users_projects
,
:dependent
=>
:destroy
has_many
:users
,
:through
=>
:users_projects
has_many
:users
,
:through
=>
:users_projects
belongs_to
:owner
,
:class_name
=>
"User"
has_many
:notes
,
:dependent
=>
:destroy
has_many
:notes
,
:dependent
=>
:destroy
validates
:name
,
validates
:name
,
...
@@ -28,7 +29,7 @@ class Project < ActiveRecord::Base
...
@@ -28,7 +29,7 @@ class Project < ActiveRecord::Base
after_destroy
:destroy_gitosis_project
after_destroy
:destroy_gitosis_project
after_save
:update_gitosis_project
after_save
:update_gitosis_project
attr_protected
:private_flag
attr_protected
:private_flag
,
:owner_id
scope
:public_only
,
where
(
:private_flag
=>
false
)
scope
:public_only
,
where
(
:private_flag
=>
false
)
...
@@ -44,7 +45,6 @@ class Project < ActiveRecord::Base
...
@@ -44,7 +45,6 @@ class Project < ActiveRecord::Base
read_attribute
(
:code
).
downcase
.
strip
.
gsub
(
' '
,
''
)
read_attribute
(
:code
).
downcase
.
strip
.
gsub
(
' '
,
''
)
end
end
def
update_gitosis_project
def
update_gitosis_project
Gitosis
.
new
.
configure
do
|
c
|
Gitosis
.
new
.
configure
do
|
c
|
c
.
update_project
(
path
,
gitosis_writers
)
c
.
update_project
(
path
,
gitosis_writers
)
...
@@ -145,5 +145,6 @@ end
...
@@ -145,5 +145,6 @@ end
# updated_at :datetime
# updated_at :datetime
# private_flag :boolean default(TRUE), not null
# private_flag :boolean default(TRUE), not null
# code :string(255)
# code :string(255)
# owner_id :integer
#
#
app/models/user.rb
View file @
0cc6c7a3
...
@@ -9,6 +9,7 @@ class User < ActiveRecord::Base
...
@@ -9,6 +9,7 @@ class User < ActiveRecord::Base
has_many
:users_projects
,
:dependent
=>
:destroy
has_many
:users_projects
,
:dependent
=>
:destroy
has_many
:projects
,
:through
=>
:users_projects
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
:keys
,
:dependent
=>
:destroy
has_many
:issues
,
has_many
:issues
,
:foreign_key
=>
:author_id
,
:foreign_key
=>
:author_id
,
...
@@ -48,5 +49,6 @@ end
...
@@ -48,5 +49,6 @@ end
# updated_at :datetime
# updated_at :datetime
# name :string(255)
# name :string(255)
# admin :boolean default(FALSE), not null
# admin :boolean default(FALSE), not null
# allowed_create_repo :boolean default(TRUE), not null
#
#
db/migrate/20111009101738_add_ownerto_project.rb
0 → 100644
View file @
0cc6c7a3
class
AddOwnertoProject
<
ActiveRecord
::
Migration
def
change
add_column
:projects
,
:owner_id
,
:integer
end
end
db/schema.rb
View file @
0cc6c7a3
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended to check this file into your version control system.
# It's strongly recommended to check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
:version
=>
2011100
5193700
)
do
ActiveRecord
::
Schema
.
define
(
:version
=>
2011100
9101738
)
do
create_table
"issues"
,
:force
=>
true
do
|
t
|
create_table
"issues"
,
:force
=>
true
do
|
t
|
t
.
string
"title"
t
.
string
"title"
...
@@ -52,6 +52,7 @@ ActiveRecord::Schema.define(:version => 20111005193700) do
...
@@ -52,6 +52,7 @@ ActiveRecord::Schema.define(:version => 20111005193700) do
t
.
datetime
"updated_at"
t
.
datetime
"updated_at"
t
.
boolean
"private_flag"
,
:default
=>
true
,
:null
=>
false
t
.
boolean
"private_flag"
,
:default
=>
true
,
:null
=>
false
t
.
string
"code"
t
.
string
"code"
t
.
integer
"owner_id"
end
end
create_table
"users"
,
:force
=>
true
do
|
t
|
create_table
"users"
,
:force
=>
true
do
|
t
|
...
...
spec/models/project_spec.rb
View file @
0cc6c7a3
...
@@ -122,5 +122,6 @@ end
...
@@ -122,5 +122,6 @@ end
# updated_at :datetime
# updated_at :datetime
# private_flag :boolean default(TRUE), not null
# private_flag :boolean default(TRUE), not null
# code :string(255)
# code :string(255)
# owner_id :integer
#
#
spec/models/user_spec.rb
View file @
0cc6c7a3
...
@@ -38,5 +38,6 @@ end
...
@@ -38,5 +38,6 @@ end
# updated_at :datetime
# updated_at :datetime
# name :string(255)
# name :string(255)
# admin :boolean default(FALSE), not null
# admin :boolean default(FALSE), not null
# allowed_create_repo :boolean default(TRUE), not null
#
#
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment