Rename snippets scopes to plural names.
This commit is contained in:
parent
84dc9cd692
commit
18b1f171bd
4 changed files with 17 additions and 17 deletions
|
@ -14,7 +14,7 @@ class SnippetsController < ApplicationController
|
|||
layout 'navless'
|
||||
|
||||
def index
|
||||
@snippets = Snippet.is_public.fresh.non_expired.page(params[:page]).per(20)
|
||||
@snippets = Snippet.are_public.fresh.non_expired.page(params[:page]).per(20)
|
||||
end
|
||||
|
||||
def user_index
|
||||
|
@ -26,15 +26,15 @@ class SnippetsController < ApplicationController
|
|||
|
||||
if @user == current_user
|
||||
@snippets = case params[:scope]
|
||||
when 'is_public' then
|
||||
@snippets.is_public
|
||||
when 'is_private' then
|
||||
@snippets.is_private
|
||||
when 'are_public' then
|
||||
@snippets.are_public
|
||||
when 'are_private' then
|
||||
@snippets.are_private
|
||||
else
|
||||
@snippets
|
||||
end
|
||||
else
|
||||
@snippets = @snippets.is_public
|
||||
@snippets = @snippets.are_public
|
||||
end
|
||||
|
||||
@snippets = @snippets.page(params[:page]).per(20)
|
||||
|
|
|
@ -34,8 +34,8 @@ class Snippet < ActiveRecord::Base
|
|||
validates :content, presence: true
|
||||
|
||||
# Scopes
|
||||
scope :is_public, -> { where(private: false) }
|
||||
scope :is_private, -> { where(private: true) }
|
||||
scope :are_public, -> { where(private: false) }
|
||||
scope :are_private, -> { where(private: true) }
|
||||
scope :fresh, -> { order("created_at DESC") }
|
||||
scope :expired, -> { where(["expires_at IS NOT NULL AND expires_at < ?", Time.current]) }
|
||||
scope :non_expired, -> { where(["expires_at IS NULL OR expires_at > ?", Time.current]) }
|
||||
|
|
|
@ -18,16 +18,16 @@
|
|||
All
|
||||
%span.pull-right
|
||||
= @user.snippets.count
|
||||
= nav_tab :scope, 'is_private' do
|
||||
= link_to user_snippets_path(@user, scope: 'is_private') do
|
||||
= nav_tab :scope, 'are_private' do
|
||||
= link_to user_snippets_path(@user, scope: 'are_private') do
|
||||
Private
|
||||
%span.pull-right
|
||||
= @user.snippets.is_private.count
|
||||
= nav_tab :scope, 'is_public' do
|
||||
= link_to user_snippets_path(@user, scope: 'is_public') do
|
||||
= @user.snippets.are_private.count
|
||||
= nav_tab :scope, 'are_public' do
|
||||
= link_to user_snippets_path(@user, scope: 'are_public') do
|
||||
Public
|
||||
%span.pull-right
|
||||
= @user.snippets.is_public.count
|
||||
= @user.snippets.are_public.count
|
||||
|
||||
.col-md-9.my-snippets
|
||||
= render 'snippets'
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
# where gem 'state_machine' was not working for Rails 4.1
|
||||
module StateMachine
|
||||
module Integrations
|
||||
module ActiveModel
|
||||
public :around_validation
|
||||
end
|
||||
module ActiveModel
|
||||
public :around_validation
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue