Fix namespace api autocomplete

Dmitriy Zaporozhets
1 parent 105f5ba3
Showing 2 changed files with 15 additions and 6 deletions Show diff stats
app/views/layouts/_init_auto_complete.html.haml
lib/api/helpers.rb
 :javascript
   $(function() {
-    GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.path}/members" if @project }";
+    GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.id}/members" if @project }";
     GitLab.GfmAutoComplete.Members.params.private_token = "#{current_user.private_token}";
     GitLab.GfmAutoComplete.Emoji.data = #{raw emoji_autocomplete_source};
@@ -5,13 +5,18 @@ module Gitlab
     end
     def user_project
-      if @project ||= current_user.projects.find_by_id(params[:id]) ||
-                      current_user.projects.find_by_path(params[:id])
+      @project ||= find_project
+      @project || not_found!
+    end
+
+    def find_project
+      project = Project.find_by_id(params[:id]) || Project.find_with_namespace(params[:id])
+
+      if project && can?(current_user, :read_project, project)
+        project
       else
-        not_found!
+        nil
       end
-
-      @project
     end
     def paginate(object)
@@ -32,6 +37,10 @@ module Gitlab
       end
     end
+    def can?(object, action, subject)
+      abilities.allowed?(object, action, subject)
+    end
+
     def attributes_for_keys(keys)
       attrs = {}
       keys.each do |key|
1	:javascript	1	:javascript
2	$(function() {	2	$(function() {
3	- GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.path}/members" if @project }";	3	+ GitLab.GfmAutoComplete.Members.url = "#{ "/api/v2/projects/#{@project.id}/members" if @project }";
4	GitLab.GfmAutoComplete.Members.params.private_token = "#{current_user.private_token}";	4	GitLab.GfmAutoComplete.Members.params.private_token = "#{current_user.private_token}";
5		5
6	GitLab.GfmAutoComplete.Emoji.data = #{raw emoji_autocomplete_source};	6	GitLab.GfmAutoComplete.Emoji.data = #{raw emoji_autocomplete_source};