Iid improvemets

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

Iid improvemets
* call set_iid before validation * make rake task pass event if objects are invalid * show iid in comment event at dashboard
Dmitriy Zaporozhets
1 parent 20397091
Showing 5 changed files with 16 additions and 6 deletions Show diff stats
app/helpers/events_helper.rb
app/models/concerns/issuable.rb
app/models/event.rb
app/views/search/_result.html.haml
lib/tasks/migrate/migrate_iids.rake
@@ -109,7 +109,7 @@ module EventsHelper
       else
         link_to event_note_target_path(event) do
           content_tag :strong do
-            "#{event.note_target_type} ##{truncate event.note_target_id}"
+            "#{event.note_target_type} ##{truncate event.note_target_iid}"
           end
         end
       end
@@ -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,
@@ -284,6 +284,14 @@ class Event &lt; 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
@@ -23,7 +23,7 @@
       %li
         merge request:
         = link_to [merge_request.target_project, merge_request] do
-          %span ##{merge_request.id}
+          %span ##{merge_request.iid}
           %strong.term
             = truncate merge_request.title, length: 50
         - if merge_request.for_fork?
@@ -37,7 +37,7 @@
       %li
         issue:
         = link_to [issue.project, issue] do
-          %span ##{issue.id}
+          %span ##{issue.iid}
           %strong.term
             = truncate issue.title, length: 50
         %span.light (#{issue.project.name_with_namespace})
@@ -4,7 +4,7 @@ task migrate_iids: :environment do
   Issue.where(iid: nil).find_each(batch_size: 100) do |issue|
     begin
       issue.set_iid
-      if issue.save
+      if issue.update_attribute(:iid, mr.iid)
         print '.'
       else
         print 'F'
@@ -19,7 +19,7 @@ task migrate_iids: :environment do
   MergeRequest.where(iid: nil).find_each(batch_size: 100) do |mr|
     begin
       mr.set_iid
-      if mr.save
+      if mr.update_attribute(:iid, mr.iid)
         print '.'
       else
         print 'F'
@@ -28,4 +28,6 @@ task migrate_iids: :environment do
       print 'F'
     end
   end
+
+  puts 'done'
 end
	@@ -109,7 +109,7 @@ module EventsHelper		@@ -109,7 +109,7 @@ module EventsHelper
109	else	109	else
110	link_to event_note_target_path(event) do	110	link_to event_note_target_path(event) do
111	content_tag :strong do	111	content_tag :strong do
112	- "#{event.note_target_type} ##{truncate event.note_target_id}"	112	+ "#{event.note_target_type} ##{truncate event.note_target_iid}"
113	end	113	end
114	end	114	end
115	end	115	end
	@@ -284,6 +284,14 @@ class Event < ActiveRecord::Base		@@ -284,6 +284,14 @@ class Event < ActiveRecord::Base
284	end	284	end
285	end	285	end
286		286
		287	+ def note_target_iid
		288	+ if note_target.respond_to?(:iid)
		289	+ note_target.iid
		290	+ else
		291	+ note_target_id
		292	+ end.to_s
		293	+ end
		294	+
287	def wall_note?	295	def wall_note?
288	target.noteable_type.blank?	296	target.noteable_type.blank?
289	end	297	end
	@@ -23,7 +23,7 @@		@@ -23,7 +23,7 @@
23	%li	23	%li
24	merge request:	24	merge request:
25	= link_to [merge_request.target_project, merge_request] do	25	= link_to [merge_request.target_project, merge_request] do
26	- %span ##{merge_request.id}	26	+ %span ##{merge_request.iid}
27	%strong.term	27	%strong.term
28	= truncate merge_request.title, length: 50	28	= truncate merge_request.title, length: 50
29	- if merge_request.for_fork?	29	- if merge_request.for_fork?
	@@ -37,7 +37,7 @@		@@ -37,7 +37,7 @@
37	%li	37	%li
38	issue:	38	issue:
39	= link_to [issue.project, issue] do	39	= link_to [issue.project, issue] do
40	- %span ##{issue.id}	40	+ %span ##{issue.iid}
41	%strong.term	41	%strong.term
42	= truncate issue.title, length: 50	42	= truncate issue.title, length: 50
43	%span.light (#{issue.project.name_with_namespace})	43	%span.light (#{issue.project.name_with_namespace})