Show iid in event feed and uatocomplete as default id for issues, mr

Dmitriy Zaporozhets
1 parent 608f3286
Showing 4 changed files with 7 additions and 3 deletions Show diff stats
app/assets/javascripts/gfm_auto_complete.js.coffee
app/models/event.rb
app/views/events/event/_common.html.haml
config/routes.rb
@@ -44,7 +44,7 @@ GitLab.GfmAutoComplete =
       tpl: @Issues.template
       callbacks:
         before_save: (issues) ->
-          $.map issues, (i) -> id: i.id, title: sanitize(i.title), search: "#{i.id} #{i.title}"
+          $.map issues, (i) -> id: i.iid, title: sanitize(i.title), search: "#{i.iid} #{i.title}"
  
     input.one "focus", =>
       $.getJSON(@dataSource).done (data) ->
@@ -256,6 +256,10 @@ class Event &lt; ActiveRecord::Base
     target.commit_id
   end
  
+  def target_iid
+    target.respond_to?(:iid) ? target.iid : target_id
+  end
+
   def note_short_commit_id
     note_commit_id[0..8]
   end
@@ -2,7 +2,7 @@
   %span.author_name= link_to_author event
   %span.event_label{class: event.action_name}= event_action_name(event)
   - if event.target
-    %strong= link_to "##{event.target_id}", [event.project, event.target]
+    %strong= link_to "##{event.target_iid}", [event.project, event.target]
   - else
     %strong= gfm event.target_title
   at
@@ -281,7 +281,7 @@ Gitlab::Application.routes.draw do
         end
       end
  
-      resources :issues, except: [:destroy] do
+      resources :issues, constraints: {id: /\d+/}, except: [:destroy] do
         collection do
           post  :bulk_update
         end
...	...	@@ -44,7 +44,7 @@ GitLab.GfmAutoComplete =
44	44	tpl: @Issues.template
45	45	callbacks:
46	46	before_save: (issues) ->
47		- $.map issues, (i) -> id: i.id, title: sanitize(i.title), search: "#{i.id} #{i.title}"
	47	+ $.map issues, (i) -> id: i.iid, title: sanitize(i.title), search: "#{i.iid} #{i.title}"
48	48
49	49	input.one "focus", =>
50	50	$.getJSON(@dataSource).done (data) ->
...	...
...	...	@@ -256,6 +256,10 @@ class Event < ActiveRecord::Base
256	256	target.commit_id
257	257	end
258	258
	259	+ def target_iid
	260	+ target.respond_to?(:iid) ? target.iid : target_id
	261	+ end
	262	+
259	263	def note_short_commit_id
260	264	note_commit_id[0..8]
261	265	end
...	...
...	...	@@ -2,7 +2,7 @@
2	2	%span.author_name= link_to_author event
3	3	%span.event_label{class: event.action_name}= event_action_name(event)
4	4	- if event.target
5		- %strong= link_to "##{event.target_id}", [event.project, event.target]
	5	+ %strong= link_to "##{event.target_iid}", [event.project, event.target]
6	6	- else
7	7	%strong= gfm event.target_title
8	8	at
...	...
...	...	@@ -281,7 +281,7 @@ Gitlab::Application.routes.draw do
281	281	end
282	282	end
283	283
284		- resources :issues, except: [:destroy] do
	284	+ resources :issues, constraints: {id: /\d+/}, except: [:destroy] do
285	285	collection do
286	286	post :bulk_update
287	287	end
...	...