Fix all the trailing whitespace

This commit is contained in:
Jakub Arnold
2013-02-07 16:45:24 +01:00
parent 1839614bcc
commit 61654ab8f0
230 changed files with 1165 additions and 1165 deletions

View File

@@ -12,5 +12,5 @@ class Admin::AdminController < ApplicationController
def ensure_is_admin
raise Discourse::InvalidAccess.new unless current_user.admin?
end
end

View File

@@ -8,8 +8,8 @@ class Admin::EmailLogsController < Admin::AdminController
def test
requires_parameter(:email_address)
Jobs.enqueue(:test_email, to_address: params[:email_address])
Jobs.enqueue(:test_email, to_address: params[:email_address])
render nothing: true
end
end
end

View File

@@ -7,4 +7,4 @@ class Admin::ExportController < Admin::AdminController
render json: failed_json.merge( message: "An #{Export.is_export_running? ? 'export' : 'import'} is currently running. Can't start a new export job right now.")
end
end
end
end

View File

@@ -1,30 +1,30 @@
require_dependency 'sql_builder'
class Admin::FlagsController < Admin::AdminController
def index
def index
sql = SqlBuilder.new "select p.id, t.title, p.cooked, p.user_id, p.topic_id, p.post_number, p.hidden, t.visible topic_visible
from posts p
from posts p
join topics t on t.id = topic_id
join (
select
post_id,
count(*) as cnt,
max(created_at) max,
min(created_at) min
select
post_id,
count(*) as cnt,
max(created_at) max,
min(created_at) min
from post_actions
/*where2*/
group by post_id
) as a on a.post_id = p.id
/*where*/
/*order_by*/
/*order_by*/
limit 100
"
sql.where2 "post_action_type_id in (:flag_types)", flag_types: PostActionType.FlagTypes
# it may make sense to add a view that shows flags on deleted posts,
# it may make sense to add a view that shows flags on deleted posts,
# we don't clear the flags on post deletion, just supress counts
# they may have deleted_at on the action not set
if params[:filter] == 'old'
@@ -41,16 +41,16 @@ limit 100
end
posts = sql.exec.to_a
if posts.length == 0
render :json => {users: [], posts: []}
return
return
end
map = {}
map = {}
users = Set.new
posts.each{ |p|
posts.each{ |p|
users << p["user_id"]
p["excerpt"] = Post.excerpt(p["cooked"])
p.delete "cooked"
@@ -58,10 +58,10 @@ limit 100
map[p["id"]] = p
}
sql = SqlBuilder.new "select a.id, a.user_id, post_action_type_id, a.created_at, post_id, a.message
sql = SqlBuilder.new "select a.id, a.user_id, post_action_type_id, a.created_at, post_id, a.message
from post_actions a
/*where*/
"
/*where*/
"
sql.where("post_action_type_id in (:flag_types)", flag_types: PostActionType.FlagTypes)
sql.where("post_id in (:posts)", posts: posts.map{|p| p["id"].to_i})
@@ -72,33 +72,33 @@ from post_actions a
end
sql.exec.each do |action|
p = map[action["post_id"]]
p = map[action["post_id"]]
p[:post_actions] ||= []
p[:post_actions] << action
users << action["user_id"]
end
sql =
sql =
"select id, username, name, email from users
where id in (?)"
users = User.exec_sql(sql, users.to_a).to_a
users.each { |u|
users.each { |u|
u["avatar_template"] = User.avatar_template(u["email"])
u.delete("email")
}
render json: MultiJson.dump({users: users, posts: posts})
render json: MultiJson.dump({users: users, posts: posts})
end
def clear
p = Post.find(params[:id])
PostAction.clear_flags!(p, current_user.id)
p.hidden = false
p.hidden = false
p.hidden_reason_id = nil
p.save
render nothing: true
render nothing: true
end
end

View File

@@ -3,8 +3,8 @@ class Admin::ImpersonateController < Admin::AdminController
def create
requires_parameters(:username_or_email)
user = User.where(['username_lower = lower(?) or lower(email) = lower(?) or lower(name) = lower(?)',
params[:username_or_email],
user = User.where(['username_lower = lower(?) or lower(email) = lower(?) or lower(name) = lower(?)',
params[:username_or_email],
params[:username_or_email],
params[:username_or_email]]).first
raise Discourse::NotFound if user.blank?
@@ -15,6 +15,6 @@ class Admin::ImpersonateController < Admin::AdminController
log_on_user(user)
render nothing: true
end
end
end

View File

@@ -1,5 +1,5 @@
class Admin::SiteCustomizationsController < Admin::AdminController
def index
@site_customizations = SiteCustomization.all

View File

@@ -1,14 +1,14 @@
class Admin::SiteSettingsController < Admin::AdminController
def index
@site_settings = SiteSetting.all_settings
@site_settings = SiteSetting.all_settings
render_json_dump(@site_settings.as_json)
end
def update
def update
requires_parameter(:value)
SiteSetting.send("#{params[:id]}=", params[:value])
render nothing: true
end
end
end

View File

@@ -3,10 +3,10 @@ class Admin::UsersController < Admin::AdminController
def index
# Sort order
if params[:query] == "active"
@users = User.order("COALESCE(last_seen_at, '01-01-1970') DESC, username")
@users = User.order("COALESCE(last_seen_at, '01-01-1970') DESC, username")
else
@users = User.order("created_at DESC, username")
end
end
@users = @users.where('approved = false') if params[:query] == 'pending'
@users = @users.where('username_lower like :filter or email like :filter', filter: "%#{params[:filter]}%") if params[:filter].present?
@@ -60,7 +60,7 @@ class Admin::UsersController < Admin::AdminController
@user = User.where(id: params[:user_id]).first
guardian.ensure_can_grant_admin!(@user)
@user.update_column(:admin, true)
render_serialized(@user, AdminUserSerializer)
render_serialized(@user, AdminUserSerializer)
end
def approve

View File

@@ -12,4 +12,4 @@ class Admin::VersionsController < Admin::AdminController
rescue RestClient::Forbidden
render json: {errors: [I18n.t("mothership.access_token_problem")]}
end
end
end