Removes pending delete from filter scopes
This commit is contained in:
parent
9da107f00b
commit
8e8eb97861
|
@ -97,7 +97,7 @@ class ProjectsController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
if @project.pending_delete?
|
||||
flash[:alert] = _("Project '%{project_name}' queued for deletion.") % { project_name: @project.name }
|
||||
flash.now[:alert] = _("Project '%{project_name}' queued for deletion.") % { project_name: @project.name }
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
|
|
|
@ -97,8 +97,8 @@ module SearchHelper
|
|||
|
||||
# Autocomplete results for the current user's projects
|
||||
def projects_autocomplete(term, limit = 5)
|
||||
current_user.authorized_projects.search_by_title(term)
|
||||
.sorted_by_stars.non_archived.limit(limit).map do |p|
|
||||
current_user.authorized_projects.search_by_title(term).
|
||||
sorted_by_stars.non_archived.limit(limit).map do |p|
|
||||
{
|
||||
category: "Projects",
|
||||
id: p.id,
|
||||
|
|
|
@ -222,9 +222,8 @@ class Project < ActiveRecord::Base
|
|||
has_many :uploads, as: :model, dependent: :destroy
|
||||
|
||||
# Scopes
|
||||
default_scope { where(pending_delete: false) }
|
||||
|
||||
scope :with_deleted, -> { unscope(where: :pending_delete) }
|
||||
scope :with_deleted, -> { where(pending_delete: true) }
|
||||
scope :without_deleted, -> { where(pending_delete: false) }
|
||||
|
||||
scope :sorted_by_activity, -> { reorder(last_activity_at: :desc) }
|
||||
scope :sorted_by_stars, -> { reorder('projects.star_count DESC') }
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
- if projects.any?
|
||||
%ul.projects-list
|
||||
- projects.each_with_index do |project, i|
|
||||
- css_class = (i >= projects_limit) ? 'hide' : nil
|
||||
- css_class = (i >= projects_limit) || project.pending_delete? ? 'hide' : nil
|
||||
= render "shared/projects/project", project: project, skip_namespace: skip_namespace,
|
||||
avatar: avatar, stars: stars, css_class: css_class, ci: ci, use_creator_avatar: use_creator_avatar,
|
||||
forks: forks, show_last_commit_as_description: show_last_commit_as_description
|
||||
|
|
Loading…
Reference in New Issue