deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Admin Group scaffold -> new, show, index

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-10-02 19:01:40 +03:00
parent d683ce5c10
commit d6363e9359
8 changed files with 175 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/group.rb
View file

@ -19,4 +19,10 @@ class Group < ActiveRecord::Base
validates :name, presence: true, uniqueness: true
validates :code, presence: true, uniqueness: true
validates :owner_id, presence: true
delegate :name, to: :owner, allow_nil: true, prefix: true
def to_param
code
end
end

5
app/models/project.rb
View file

@ -26,9 +26,12 @@ class Project < ActiveRecord::Base
has_many :wikis, dependent: :destroy
has_many :protected_branches, dependent: :destroy
delegate :name, to: :owner, allow_nil: true, prefix: true
# Scopes
scope :public_only, where(private_flag: false)
scope :without_user, lambda { |user| where("id not in (:ids)", ids: user.projects.map(&:id) ) }
scope :without_user, ->(user) { where("id not in (:ids)", ids: user.projects.map(&:id) ) }
scope :not_in_group, ->(group) { where("id not in (:ids)", ids: group.project_ids ) }
def self.active
joins(:issues, :notes, :merge_requests).order("issues.created_at, notes.created_at, merge_requests.created_at DESC")