Browse Source

Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

pull/313/head
“xxq250” 3 years ago
parent
commit
0936bbd1c8
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      app/controllers/users/is_pinned_projects_controller.rb

+ 5
- 2
app/controllers/users/is_pinned_projects_controller.rb View File

@@ -1,7 +1,10 @@
class Users::IsPinnedProjectsController < Users::BaseController
before_action :private_user_resources!, only: [:pin]
def index
@is_pinned_projects = observed_user.pinned_projects.order(position: :desc, created_at: :asc).includes(project: [:project_category, :project_language, :repository]).order(position: :desc)
def index
@is_pinned_projects = observed_user.pinned_projects.left_joins(:project)
.where("projects.is_public = TRUE")
.order(position: :desc, created_at: :asc)
.includes(project: [:project_category, :project_language, :repository]).order(position: :desc)
@is_pinned_projects = kaminari_paginate(@is_pinned_projects)
end


Loading…
Cancel
Save