From 4897d5df4ef4fe9a61067f84db5a293eebf9eb19 Mon Sep 17 00:00:00 2001 From: rgarcia Date: Thu, 3 Sep 2015 01:29:46 +0200 Subject: [PATCH] makes spaces consistent --- app/controllers/account_controller.rb | 1 - app/controllers/admin/comments_controller.rb | 1 - app/controllers/admin/moderators_controller.rb | 1 - app/controllers/admin/organizations_controller.rb | 1 - app/controllers/admin/users_controller.rb | 1 - app/controllers/api/stats_controller.rb | 2 ++ app/controllers/moderation/base_controller.rb | 2 +- app/controllers/moderation/comments_controller.rb | 2 +- app/controllers/moderation/debates_controller.rb | 1 - app/controllers/organizations/registrations_controller.rb | 1 + app/controllers/pages_controller.rb | 1 - app/controllers/stats_controller.rb | 2 +- app/controllers/users/omniauth_callbacks_controller.rb | 2 ++ app/helpers/application_helper.rb | 1 + app/helpers/cache_keys_helper.rb | 2 ++ app/helpers/flags_helper.rb | 2 ++ app/helpers/stats_helper.rb | 1 + app/models/flag.rb | 1 - app/models/organization.rb | 1 - app/models/setting.rb | 1 - 20 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 23af8c91bc7..625452196fa 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -1,5 +1,4 @@ class AccountController < ApplicationController - before_action :authenticate_user! before_action :set_account load_and_authorize_resource class: "User" diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb index 0399ccd63b4..6c1d994ee51 100644 --- a/app/controllers/admin/comments_controller.rb +++ b/app/controllers/admin/comments_controller.rb @@ -1,5 +1,4 @@ class Admin::CommentsController < Admin::BaseController - has_filters %w{all with_confirmed_hide} before_filter :load_comment, only: [:confirm_hide, :restore] diff --git a/app/controllers/admin/moderators_controller.rb b/app/controllers/admin/moderators_controller.rb index f2ef6f1c336..e15e9273fe6 100644 --- a/app/controllers/admin/moderators_controller.rb +++ b/app/controllers/admin/moderators_controller.rb @@ -1,5 +1,4 @@ class Admin::ModeratorsController < Admin::BaseController - load_and_authorize_resource def index diff --git a/app/controllers/admin/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb index 0e704e9a132..e5ba390e1d4 100644 --- a/app/controllers/admin/organizations_controller.rb +++ b/app/controllers/admin/organizations_controller.rb @@ -1,5 +1,4 @@ class Admin::OrganizationsController < Admin::BaseController - has_filters %w{all pending verified rejected}, only: :index load_and_authorize_resource except: :search diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index ecf7f206aa2..cf104edf02a 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -1,5 +1,4 @@ class Admin::UsersController < Admin::BaseController - has_filters %w{all with_confirmed_hide}, only: :index before_filter :load_user, only: [:confirm_hide, :restore] diff --git a/app/controllers/api/stats_controller.rb b/app/controllers/api/stats_controller.rb index d44262b45d3..fc0bf35635a 100644 --- a/app/controllers/api/stats_controller.rb +++ b/app/controllers/api/stats_controller.rb @@ -1,4 +1,5 @@ class Api::StatsController < Api::ApiController + def show unless params[:events].present? || params[:visits].present? return render json: {}, status: :bad_request @@ -19,4 +20,5 @@ def show render json: ds.build end + end diff --git a/app/controllers/moderation/base_controller.rb b/app/controllers/moderation/base_controller.rb index f2a794526a0..de0c46a795b 100644 --- a/app/controllers/moderation/base_controller.rb +++ b/app/controllers/moderation/base_controller.rb @@ -2,9 +2,9 @@ class Moderation::BaseController < ApplicationController layout 'admin' before_action :authenticate_user! + before_action :verify_moderator skip_authorization_check - before_action :verify_moderator private diff --git a/app/controllers/moderation/comments_controller.rb b/app/controllers/moderation/comments_controller.rb index 065516531b8..40e475b21b7 100644 --- a/app/controllers/moderation/comments_controller.rb +++ b/app/controllers/moderation/comments_controller.rb @@ -1,6 +1,6 @@ class Moderation::CommentsController < Moderation::BaseController - has_filters %w{all pending_flag_review with_ignored_flag}, only: :index + before_filter :load_comments, only: :index load_and_authorize_resource diff --git a/app/controllers/moderation/debates_controller.rb b/app/controllers/moderation/debates_controller.rb index 5fdd1904960..29e01d3781e 100644 --- a/app/controllers/moderation/debates_controller.rb +++ b/app/controllers/moderation/debates_controller.rb @@ -1,5 +1,4 @@ class Moderation::DebatesController < Moderation::BaseController - has_filters %w{all pending_flag_review with_ignored_flag}, only: :index before_filter :load_debates, only: :index diff --git a/app/controllers/organizations/registrations_controller.rb b/app/controllers/organizations/registrations_controller.rb index 630cc64e4a4..6445622e26f 100644 --- a/app/controllers/organizations/registrations_controller.rb +++ b/app/controllers/organizations/registrations_controller.rb @@ -1,4 +1,5 @@ class Organizations::RegistrationsController < Devise::RegistrationsController + def new super do |user| user.build_organization diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb index 7849066187b..11f71596008 100644 --- a/app/controllers/pages_controller.rb +++ b/app/controllers/pages_controller.rb @@ -1,5 +1,4 @@ class PagesController < ApplicationController - skip_authorization_check def census_terms diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index 1e76feb4271..fe224eb8d1c 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -1,6 +1,6 @@ class StatsController < ApplicationController - skip_authorization_check before_action :verify_administrator + skip_authorization_check def show @event_types = Ahoy::Event.select(:name).uniq.pluck(:name) diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index 8588ba243dd..423ecedad7b 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -1,4 +1,5 @@ class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController + def self.provides_callback_for(provider) class_eval %Q{ def #{provider} @@ -26,4 +27,5 @@ def after_sign_in_path_for(resource) finish_signup_path end end + end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 77afc1317b2..33fc7e0fa28 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,4 +1,5 @@ module ApplicationHelper + def percentage(vote, debate) return "0%" if debate.total_votes == 0 debate.send(vote).percent_of(debate.total_votes).to_s + "%" diff --git a/app/helpers/cache_keys_helper.rb b/app/helpers/cache_keys_helper.rb index 9aa6000cc95..38445ae025d 100644 --- a/app/helpers/cache_keys_helper.rb +++ b/app/helpers/cache_keys_helper.rb @@ -1,4 +1,5 @@ module CacheKeysHelper + def locale_and_user_status @cache_key_user ||= calculate_user_status "#{I18n.locale}/#{@cache_key_user}" @@ -17,4 +18,5 @@ def calculate_user_status user_status end + end \ No newline at end of file diff --git a/app/helpers/flags_helper.rb b/app/helpers/flags_helper.rb index b54c86b48ee..b5ba67f416c 100644 --- a/app/helpers/flags_helper.rb +++ b/app/helpers/flags_helper.rb @@ -1,4 +1,5 @@ module FlagsHelper + def show_flag_action?(flaggable) current_user && !own_flaggable?(flaggable) && !flagged?(flaggable) end @@ -24,4 +25,5 @@ def own_flaggable?(flaggable) flaggable.author_id == current_user.id end end + end diff --git a/app/helpers/stats_helper.rb b/app/helpers/stats_helper.rb index e517767e345..b852afe9c0a 100644 --- a/app/helpers/stats_helper.rb +++ b/app/helpers/stats_helper.rb @@ -1,4 +1,5 @@ module StatsHelper + def events_chart_tag(events, opt={}) events = events.join(',') if events.is_a? Array opt[:data] ||= {} diff --git a/app/models/flag.rb b/app/models/flag.rb index a8be6da7640..2d13d26d937 100644 --- a/app/models/flag.rb +++ b/app/models/flag.rb @@ -1,5 +1,4 @@ class Flag < ActiveRecord::Base - belongs_to :user belongs_to :flaggable, polymorphic: true, counter_cache: true diff --git a/app/models/organization.rb b/app/models/organization.rb index a4561ba7fad..fa991fc0551 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -1,5 +1,4 @@ class Organization < ActiveRecord::Base - belongs_to :user validates :name, presence: true diff --git a/app/models/setting.rb b/app/models/setting.rb index 8e1504bf3bd..f696ceefd59 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -1,5 +1,4 @@ class Setting < ActiveRecord::Base - validates :key, presence: true, uniqueness: true default_scope { order(key: :desc) }