kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix public project search

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-01-09 10:29:55 +02:00
parent f8f76fdbfd
commit cb589d231a
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/search_controller.rb
View file

@ -15,7 +15,7 @@ class SearchController < ApplicationController
@total_results = @projects.count + @merge_requests.count + @issues.count + @wiki_pages.count + @blobs.total_count
end
private
private
def find_project_ids(group_id, project_id)
project_ids = current_user.authorized_projects.map(&:id)
@ -26,7 +26,7 @@ class SearchController < ApplicationController
project_ids.select! { |id| group_project_ids.include?(id) }
elsif project_id.present?
@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
project_ids
end

5
app/views/admin/projects/show.html.haml
View file

@ -79,13 +79,14 @@
.title
Transfer project
.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
= f.label :namespace_id, "Namespace"
= f.label :namespace_id, "Namespace", class: 'control-label'
.col-sm-10
= namespace_select_tag :namespace_id, selected: params[:namespace_id], class: 'input-large'
.form-group
.col-sm-2
.col-sm-10
= f.submit 'Transfer', class: 'btn btn-primary'