Iid improvemets

* call set_iid before validation
* make rake task pass event if objects are invalid
* show iid in comment event at dashboard

2 files changed, 9 insertions, 1 deletions

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 158c226480f..fb08a5aa750 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -16,6 +16,7 @@ module Issuable
 
     validates :author, presence: true
     validates :title, presence: true, length: { within: 0..255 }
+    validate :set_iid, on: :create
     validates :iid, presence: true, numericality: true
 
     scope :authored, ->(user) { where(author_id: user) }
@@ -25,7 +26,6 @@ module Issuable
     scope :unassigned, -> { where("assignee_id IS NULL") }
     scope :of_projects, ->(ids) { where(project_id: ids) }
 
-    validate :set_iid, on: :create
 
     delegate :name,
              :email,
diff --git a/app/models/event.rb b/app/models/event.rb
index 5839a834e78..702891f13dc 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -284,6 +284,14 @@ class Event < ActiveRecord::Base
     end
   end
 
+  def note_target_iid
+    if note_target.respond_to?(:iid)
+      note_target.iid
+    else
+      note_target_id
+    end.to_s
+  end
+
   def wall_note?
     target.noteable_type.blank?
   end