From 57a44f2da3d2a0b59209b6c2d653d04efd0d3d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarka=20Kadlecov=C3=A1?= Date: Wed, 13 Jun 2018 18:11:10 +0200 Subject: Support todos for epics backport --- app/models/group.rb | 9 +++++++++ app/models/todo.rb | 11 +++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) (limited to 'app/models') diff --git a/app/models/group.rb b/app/models/group.rb index 9c171de7fc3..9baf2cfd810 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -39,6 +39,8 @@ class Group < Namespace has_many :boards has_many :badges, class_name: 'GroupBadge' + has_many :todos + accepts_nested_attributes_for :variables, allow_destroy: true validate :visibility_level_allowed_by_projects @@ -82,6 +84,13 @@ class Group < Namespace where(id: user.authorized_groups.select(:id).reorder(nil)) end + def public_or_visible_to_user(user) + where('id IN (?) OR namespaces.visibility_level IN (?)', + user.authorized_groups.select(:id), + Gitlab::VisibilityLevel.levels_for_user(user) + ) + end + def select_for_project_authorization if current_scope.joins_values.include?(:shared_projects) joins('INNER JOIN namespaces project_namespace ON project_namespace.id = projects.namespace_id') diff --git a/app/models/todo.rb b/app/models/todo.rb index a2ab405fdbe..5ce77d5ddc2 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -22,15 +22,18 @@ class Todo < ActiveRecord::Base belongs_to :author, class_name: "User" belongs_to :note belongs_to :project + belongs_to :group belongs_to :target, polymorphic: true, touch: true # rubocop:disable Cop/PolymorphicAssociations belongs_to :user delegate :name, :email, to: :author, prefix: true, allow_nil: true - validates :action, :project, :target_type, :user, presence: true + validates :action, :target_type, :user, presence: true validates :author, presence: true validates :target_id, presence: true, unless: :for_commit? validates :commit_id, presence: true, if: :for_commit? + validates :project, presence: true, unless: :group + validates :group, presence: true, unless: :project scope :pending, -> { with_state(:pending) } scope :done, -> { with_state(:done) } @@ -44,7 +47,7 @@ class Todo < ActiveRecord::Base state :done end - after_save :keep_around_commit + after_save :keep_around_commit, if: :commit_id class << self # Priority sorting isn't displayed in the dropdown, because we don't show @@ -79,6 +82,10 @@ class Todo < ActiveRecord::Base end end + def parent + project || group + end + def unmergeable? action == UNMERGEABLE end -- cgit v1.2.1 From 7458ca8ebb093af93c01cb61dabca15fd0c995cb Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Thu, 21 Jun 2018 08:24:03 +0200 Subject: [backend] Addressed review comments * Group filtering now includes also issues/MRs from subgroups/subprojects * fixed due_date * Also DRYed todo controller specs --- app/models/concerns/issuable.rb | 6 ++++++ app/models/issue.rb | 4 ---- app/models/note.rb | 4 ++++ app/models/todo.rb | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) (limited to 'app/models') diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index b93c1145f82..7a459078151 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -243,6 +243,12 @@ module Issuable opened? end + def overdue? + return false unless respond_to?(:due_date) + + due_date.try(:past?) || false + end + def user_notes_count if notes.loaded? # Use the in-memory association to select and count to avoid hitting the db diff --git a/app/models/issue.rb b/app/models/issue.rb index 4715d942c8d..983684a5e05 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -275,10 +275,6 @@ class Issue < ActiveRecord::Base user ? readable_by?(user) : publicly_visible? end - def overdue? - due_date.try(:past?) || false - end - def check_for_spam? project.public? && (title_changed? || description_changed?) end diff --git a/app/models/note.rb b/app/models/note.rb index abc40d9016e..9191cae6391 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -229,6 +229,10 @@ class Note < ActiveRecord::Base !for_personal_snippet? end + def for_issuable_with_ability? + for_issue? || for_merge_request? + end + def skip_project_check? !for_project_noteable? end diff --git a/app/models/todo.rb b/app/models/todo.rb index 5ce77d5ddc2..61158285ea9 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -32,8 +32,8 @@ class Todo < ActiveRecord::Base validates :author, presence: true validates :target_id, presence: true, unless: :for_commit? validates :commit_id, presence: true, if: :for_commit? - validates :project, presence: true, unless: :group - validates :group, presence: true, unless: :project + validates :project, presence: true, unless: :group_id + validates :group, presence: true, unless: :project_id scope :pending, -> { with_state(:pending) } scope :done, -> { with_state(:done) } -- cgit v1.2.1 From ef0df760fc3f8b79b9e1cb4a1669df1a667ba8be Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Fri, 29 Jun 2018 13:27:58 +0200 Subject: Minor syntax fix --- app/models/group.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/models') diff --git a/app/models/group.rb b/app/models/group.rb index 9baf2cfd810..b0392774379 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -87,8 +87,7 @@ class Group < Namespace def public_or_visible_to_user(user) where('id IN (?) OR namespaces.visibility_level IN (?)', user.authorized_groups.select(:id), - Gitlab::VisibilityLevel.levels_for_user(user) - ) + Gitlab::VisibilityLevel.levels_for_user(user)) end def select_for_project_authorization -- cgit v1.2.1 From 50c1a989cc9c756c343e1f169474e35c3850bbc1 Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Fri, 29 Jun 2018 16:08:18 +0200 Subject: More EE->CE fixes --- app/models/todo.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/todo.rb b/app/models/todo.rb index 61158285ea9..942cbb754e3 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -83,7 +83,7 @@ class Todo < ActiveRecord::Base end def parent - project || group + project end def unmergeable? -- cgit v1.2.1 From c9d561b1c2802aa971b566d434dfffa101129e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarka=20Kadlecov=C3=A1?= Date: Tue, 3 Jul 2018 08:48:00 +0200 Subject: Use for_issuable? instead of for_issuable_with_ability? --- app/models/note.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/note.rb b/app/models/note.rb index 9191cae6391..3918bbee194 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -229,7 +229,7 @@ class Note < ActiveRecord::Base !for_personal_snippet? end - def for_issuable_with_ability? + def for_issuable? for_issue? || for_merge_request? end -- cgit v1.2.1