DEV: Apply syntax_tree formatting to plugins/*

This commit is contained in:
David Taylor
2023-01-06 20:42:16 +00:00
parent 93e2dad656
commit 055310cea4
110 changed files with 3712 additions and 3158 deletions

View File

@@ -3,7 +3,7 @@
class DiscoursePoll::PollsController < ::ApplicationController
requires_plugin DiscoursePoll::PLUGIN_NAME
before_action :ensure_logged_in, except: [:voters, :grouped_poll_results]
before_action :ensure_logged_in, except: %i[voters grouped_poll_results]
def vote
post_id = params.require(:post_id)
@@ -63,8 +63,14 @@ class DiscoursePoll::PollsController < ::ApplicationController
begin
render json: {
grouped_results: DiscoursePoll::Poll.grouped_poll_results(current_user, post_id, poll_name, user_field_name)
}
grouped_results:
DiscoursePoll::Poll.grouped_poll_results(
current_user,
post_id,
poll_name,
user_field_name,
),
}
rescue DiscoursePoll::Error => e
render_json_error e.message
end

View File

@@ -9,33 +9,15 @@ class Poll < ActiveRecord::Base
has_many :poll_options, -> { order(:id) }, dependent: :destroy
has_many :poll_votes
enum type: {
regular: 0,
multiple: 1,
number: 2,
}, _scopes: false
enum type: { regular: 0, multiple: 1, number: 2 }, _scopes: false
enum status: {
open: 0,
closed: 1,
}, _scopes: false
enum status: { open: 0, closed: 1 }, _scopes: false
enum results: {
always: 0,
on_vote: 1,
on_close: 2,
staff_only: 3,
}, _scopes: false
enum results: { always: 0, on_vote: 1, on_close: 2, staff_only: 3 }, _scopes: false
enum visibility: {
secret: 0,
everyone: 1,
}, _scopes: false
enum visibility: { secret: 0, everyone: 1 }, _scopes: false
enum chart_type: {
bar: 0,
pie: 1
}, _scopes: false
enum chart_type: { bar: 0, pie: 1 }, _scopes: false
validates :min, numericality: { allow_nil: true, only_integer: true, greater_than_or_equal_to: 0 }
validates :max, numericality: { allow_nil: true, only_integer: true, greater_than: 0 }

View File

@@ -48,13 +48,15 @@ class PollSerializer < ApplicationSerializer
PollOptionSerializer.new(
option,
root: false,
scope: { can_see_results: can_see_results }
scope: {
can_see_results: can_see_results,
},
).as_json
end
end
def voters
object.poll_votes.count('DISTINCT user_id') + object.anonymous_voters.to_i
object.poll_votes.count("DISTINCT user_id") + object.anonymous_voters.to_i
end
def close
@@ -72,5 +74,4 @@ class PollSerializer < ApplicationSerializer
def include_preloaded_voters?
object.can_see_voters?(scope.user)
end
end