Commit cb589d23 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix public project search

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent f8f76fdb
...@@ -15,7 +15,7 @@ class SearchController < ApplicationController ...@@ -15,7 +15,7 @@ class SearchController < ApplicationController
@total_results = @projects.count + @merge_requests.count + @issues.count + @wiki_pages.count + @blobs.total_count @total_results = @projects.count + @merge_requests.count + @issues.count + @wiki_pages.count + @blobs.total_count
end end
private private
def find_project_ids(group_id, project_id) def find_project_ids(group_id, project_id)
project_ids = current_user.authorized_projects.map(&:id) project_ids = current_user.authorized_projects.map(&:id)
...@@ -26,7 +26,7 @@ class SearchController < ApplicationController ...@@ -26,7 +26,7 @@ class SearchController < ApplicationController
project_ids.select! { |id| group_project_ids.include?(id) } project_ids.select! { |id| group_project_ids.include?(id) }
elsif project_id.present? elsif project_id.present?
@project = Project.find(project_id) @project = Project.find(project_id)
project_ids = @project.public ? [@project.id] : project_ids.select { |id| id == project_id.to_i } project_ids = @project.public? ? [@project.id] : project_ids.select { |id| id == project_id.to_i }
end end
project_ids project_ids
end end
......
...@@ -79,13 +79,14 @@ ...@@ -79,13 +79,14 @@
.title .title
Transfer project Transfer project
.body .body
= form_for @project, url: transfer_admin_project_path(@project), method: :put do |f| = form_for @project, url: transfer_admin_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f|
.form-group .form-group
= f.label :namespace_id, "Namespace" = f.label :namespace_id, "Namespace", class: 'control-label'
.col-sm-10 .col-sm-10
= namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large' = namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large'
.form-group .form-group
.col-sm-2
.col-sm-10 .col-sm-10
= f.submit 'Transfer', class: 'btn btn-primary' = f.submit 'Transfer', class: 'btn btn-primary'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment