summaryrefslogtreecommitdiff
path: root/app/controllers/projects/forks_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-03 14:35:41 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-03-03 14:35:41 +0000
commit11b6aeafbafa221f34a555b8c862a1de3eb87aed (patch)
treee11da6f2a695b3cc8c8875e60da5142d38946f6f /app/controllers/projects/forks_controller.rb
parent1cb4f810a5edb6118e06d735a6cd4bd14eb80320 (diff)
parent022e38540a60171bcd5adc9c29bb2507b0ab4b08 (diff)
downloadgitlab-ce-11b6aeafbafa221f34a555b8c862a1de3eb87aed.tar.gz
Merge branch 'refactor-projects-list' into 'master'
Refactor projects list 1. Fix double bottom border if pagination 2. Fix broken search on forks page 4. Remove duplicate js logic 4. Remove unused show all link 5. Remove duplicate “no project” message in different views After this merge request you can easily render shared projects template with all necessary html/js included to make searchable list with pagination. All you need to provide is controller that returns projects list with seach nad pagination and render html form with project-filter-form id and text field with filter_projects name. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @DouweM See merge request !3075
Diffstat (limited to 'app/controllers/projects/forks_controller.rb')
-rw-r--r--app/controllers/projects/forks_controller.rb11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/controllers/projects/forks_controller.rb b/app/controllers/projects/forks_controller.rb
index c71b83c89b7..7b202f3862f 100644
--- a/app/controllers/projects/forks_controller.rb
+++ b/app/controllers/projects/forks_controller.rb
@@ -12,7 +12,18 @@ class Projects::ForksController < Projects::ApplicationController
@public_forks_count = @total_forks_count - @private_forks_count
@sort = params[:sort] || 'id_desc'
+ @forks = @forks.search(params[:filter_projects]) if params[:filter_projects].present?
@forks = @forks.order_by(@sort).page(params[:page]).per(PER_PAGE)
+
+ respond_to do |format|
+ format.html
+
+ format.json do
+ render json: {
+ html: view_to_html_string("projects/forks/_projects", projects: @forks)
+ }
+ end
+ end
end
def new