From 839957cf56acb905afc18605c0579d07083e0d37 Mon Sep 17 00:00:00 2001 From: Andrew8xx8 Date: Wed, 13 Feb 2013 15:48:16 +0400 Subject: Constants in Events looks good now --- app/models/event.rb | 36 ++++++++++++++++++------------------ app/models/merge_request.rb | 6 +++--- app/models/project.rb | 4 ++-- 3 files changed, 23 insertions(+), 23 deletions(-) (limited to 'app/models') diff --git a/app/models/event.rb b/app/models/event.rb index 97b1e3306aa..18422e192a4 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -20,15 +20,15 @@ class Event < ActiveRecord::Base default_scope where("author_id IS NOT NULL") - Created = 1 - Updated = 2 - Closed = 3 - Reopened = 4 - Pushed = 5 - Commented = 6 - Merged = 7 - Joined = 8 # User joined project - Left = 9 # User left project + CREATED = 1 + UPDATED = 2 + CLOSED = 3 + REOPENED = 4 + PUSHED = 5 + COMMENTED = 6 + MERGED = 7 + JOINED = 8 # User joined project + LEFT = 9 # User left project delegate :name, :email, to: :author, prefix: true, allow_nil: true delegate :title, to: :issue, prefix: true, allow_nil: true @@ -43,15 +43,15 @@ class Event < ActiveRecord::Base # Scopes scope :recent, -> { order("created_at DESC") } - scope :code_push, -> { where(action: Pushed) } + scope :code_push, -> { where(action: PUSHED) } scope :in_projects, ->(project_ids) { where(project_id: project_ids).recent } class << self def determine_action(record) if [Issue, MergeRequest].include? record.class - Event::Created + Event::CREATED elsif record.kind_of? Note - Event::Commented + Event::COMMENTED end end end @@ -79,19 +79,19 @@ class Event < ActiveRecord::Base end def push? - action == self.class::Pushed && valid_push? + action == self.class::PUSHED && valid_push? end def merged? - action == self.class::Merged + action == self.class::MERGED end def closed? - action == self.class::Closed + action == self.class::CLOSED end def reopened? - action == self.class::Reopened + action == self.class::REOPENED end def milestone? @@ -111,11 +111,11 @@ class Event < ActiveRecord::Base end def joined? - action == Joined + action == JOINED end def left? - action == Left + action == LEFT end def membership_changed? diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b6ea85f6507..345b8d6e07d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -133,11 +133,11 @@ class MergeRequest < ActiveRecord::Base end def merge_event - self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::Merged).last + self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last end def closed_event - self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::Closed).last + self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last end def commits @@ -184,7 +184,7 @@ class MergeRequest < ActiveRecord::Base self.mark_as_merged! Event.create( project: self.project, - action: Event::Merged, + action: Event::MERGED, target_id: self.id, target_type: "MergeRequest", author_id: user_id diff --git a/app/models/project.rb b/app/models/project.rb index acc1b8d2328..15b2d858b62 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -103,7 +103,7 @@ class Project < ActiveRecord::Base end def with_push - includes(:events).where('events.action = ?', Event::Pushed) + includes(:events).where('events.action = ?', Event::PUSHED) end def active @@ -336,7 +336,7 @@ class Project < ActiveRecord::Base def observe_push(data) Event.create( project: self, - action: Event::Pushed, + action: Event::PUSHED, data: data, author_id: data[:user_id] ) -- cgit v1.2.1 From 6b24c375cbf39ad407b504d1ac386566a1571c76 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 13 Feb 2013 17:28:28 +0200 Subject: style admin -> users page. Search by username too --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/user.rb b/app/models/user.rb index 8c1a8b42b67..3ad8f1c33f6 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -138,7 +138,7 @@ class User < ActiveRecord::Base end def search query - where("name LIKE :query or email LIKE :query", query: "%#{query}%") + where("name LIKE :query OR email LIKE :query OR username LIKE :query", query: "%#{query}%") end end -- cgit v1.2.1 From ed3f44085e01f50864ce840f007a50d2154df6f5 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 13 Feb 2013 19:14:35 +0200 Subject: Redesign Admin -> user -> show page --- app/models/user.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'app/models') diff --git a/app/models/user.rb b/app/models/user.rb index 3ad8f1c33f6..10af9b8c165 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -313,4 +313,8 @@ class User < ActiveRecord::Base UserTeam.where(id: ids) end end + + def owned_teams + UserTeam.where(owner_id: self.id) + end end -- cgit v1.2.1