Commit 8952fc01 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Apply default scope to labels and remove one for notes

parent c5be267e
...@@ -7,7 +7,7 @@ class Projects::LabelsController < Projects::ApplicationController ...@@ -7,7 +7,7 @@ class Projects::LabelsController < Projects::ApplicationController
respond_to :js, :html respond_to :js, :html
def index def index
@labels = @project.labels.order_by_name.page(params[:page]).per(20) @labels = @project.labels.page(params[:page]).per(20)
end end
def new def new
......
...@@ -22,6 +22,7 @@ class NotesFinder ...@@ -22,6 +22,7 @@ class NotesFinder
end end
# Use overlapping intervals to avoid worrying about race conditions # Use overlapping intervals to avoid worrying about race conditions
notes.where('updated_at > ?', last_fetched_at - FETCH_OVERLAP) notes.where('updated_at > ?', last_fetched_at - FETCH_OVERLAP).
order(created_at: :asc, id: :asc)
end end
end end
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
# #
class Label < ActiveRecord::Base class Label < ActiveRecord::Base
include Sortable
DEFAULT_COLOR = '#428BCA' DEFAULT_COLOR = '#428BCA'
belongs_to :project belongs_to :project
...@@ -30,7 +28,7 @@ class Label < ActiveRecord::Base ...@@ -30,7 +28,7 @@ class Label < ActiveRecord::Base
format: { with: /\A[^&\?,&]+\z/ }, format: { with: /\A[^&\?,&]+\z/ },
uniqueness: { scope: :project_id } uniqueness: { scope: :project_id }
scope :order_by_name, -> { reorder("labels.title ASC") } default_scope { order(title: :asc) }
alias_attribute :name, :title alias_attribute :name, :title
......
...@@ -23,7 +23,6 @@ require 'file_size_validator' ...@@ -23,7 +23,6 @@ require 'file_size_validator'
class Note < ActiveRecord::Base class Note < ActiveRecord::Base
include Mentionable include Mentionable
default_scope { order(created_at: :asc, id: :asc) }
default_value_for :system, false default_value_for :system, false
attr_mentionable :note attr_mentionable :note
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
= link_to page_filter_path(label_name: nil) do = link_to page_filter_path(label_name: nil) do
Any Any
- if @project.labels.any? - if @project.labels.any?
- @project.labels.order_by_name.each do |label| - @project.labels.each do |label|
%li %li
= link_to page_filter_path(label_name: label.name) do = link_to page_filter_path(label_name: label.name) do
= render_colored_label(label) = render_colored_label(label)
......
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