From e0cb2047e6e4da5618fd5df9887aea4b835c21b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 9 Nov 2019 23:24:54 +0100 Subject: [PATCH 1/5] Remove unused controller It was probably added by accident in commit 85c08da7. --- app/controllers/admin/widget/base_controller.rb | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 app/controllers/admin/widget/base_controller.rb diff --git a/app/controllers/admin/widget/base_controller.rb b/app/controllers/admin/widget/base_controller.rb deleted file mode 100644 index bc72bf389f4..00000000000 --- a/app/controllers/admin/widget/base_controller.rb +++ /dev/null @@ -1,9 +0,0 @@ -class Admin::Widget::BaseController < Admin::BaseController - helper_method :namespace - - private - - def namespace - "admin" - end -end From 23d132c3d3b415b5316ec72b0e1cbb9a36d7584a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 9 Nov 2019 23:28:59 +0100 Subject: [PATCH 2/5] Remove obsolete controller concern It isn't used since commit 18f0697e. --- app/controllers/admin/settings_controller.rb | 8 ---- .../admin/manages_proposal_settings.rb | 41 ------------------- 2 files changed, 49 deletions(-) delete mode 100644 app/controllers/concerns/admin/manages_proposal_settings.rb diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index d5d8810cea6..fc9599131ae 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -1,12 +1,4 @@ class Admin::SettingsController < Admin::BaseController - include Admin::ManagesProposalSettings - - helper_method :successful_proposal_setting, :successful_proposals, - :poll_feature_short_title_setting, :poll_feature_description_setting, - :poll_feature_link_setting, :email_feature_short_title_setting, - :email_feature_description_setting, - :poster_feature_short_title_setting, :poster_feature_description_setting - def index all_settings = Setting.all.group_by(&:type) @configuration_settings = all_settings["configuration"] diff --git a/app/controllers/concerns/admin/manages_proposal_settings.rb b/app/controllers/concerns/admin/manages_proposal_settings.rb deleted file mode 100644 index 9ef969fdd49..00000000000 --- a/app/controllers/concerns/admin/manages_proposal_settings.rb +++ /dev/null @@ -1,41 +0,0 @@ -module Admin::ManagesProposalSettings - extend ActiveSupport::Concern - - included do - def successful_proposal_setting - @successful_proposal_setting ||= Setting.find_by(key: "proposals.successful_proposal_id") - end - - def successful_proposals - Proposal.successful - end - - def poll_feature_short_title_setting - @poll_feature_short_title_setting ||= Setting.find_by(key: "proposals.poll_short_title") - end - - def poll_feature_description_setting - @poll_feature_description_setting ||= Setting.find_by(key: "proposals.poll_description") - end - - def poll_feature_link_setting - @poll_feature_link_setting ||= Setting.find_by(key: "proposals.poll_link") - end - - def email_feature_short_title_setting - @email_feature_short_title_setting ||= Setting.find_by(key: "proposals.email_short_title") - end - - def email_feature_description_setting - @email_feature_description_setting ||= Setting.find_by(key: "proposals.email_description") - end - - def poster_feature_short_title_setting - @poster_feature_short_title_setting ||= Setting.find_by(key: "proposals.poster_short_title") - end - - def poster_feature_description_setting - @poster_feature_description_setting ||= Setting.find_by(key: "proposals.poster_description") - end - end -end From 3eda2de2d5b4076776fab2a8938e63994433f225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sat, 9 Nov 2019 23:50:07 +0100 Subject: [PATCH 3/5] Remove unused helper methods They aren't used since commits a6585361, 3752f3a5, 88a7a29d, eef8ad1b, f67f058b, 04910fea and 9181610d. The method `image_bytes_to_megabytes` was never used and is a duplicate of the method `bytes_to_megabytes`. --- .../concerns/dashboard/group_supports.rb | 11 ----------- app/helpers/application_helper.rb | 8 -------- app/helpers/documents_helper.rb | 4 ---- app/helpers/imageables_helper.rb | 4 ---- app/helpers/images_helper.rb | 4 ---- app/helpers/officers_helper.rb | 4 ---- app/helpers/polls_helper.rb | 16 ---------------- 7 files changed, 51 deletions(-) diff --git a/app/controllers/concerns/dashboard/group_supports.rb b/app/controllers/concerns/dashboard/group_supports.rb index f9dfe0fbc4e..3ca5d482650 100644 --- a/app/controllers/concerns/dashboard/group_supports.rb +++ b/app/controllers/concerns/dashboard/group_supports.rb @@ -39,17 +39,6 @@ def fill_holes(grouped_votes) complete_grouped_votes end - - def previous_key_for(date) - grouping_key_for(date - interval) - end - - def interval - return 1.week if params[:group_by] == "week" - return 1.month if params[:group_by] == "month" - - 1.day - end end private diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 395faecffaa..255534a884e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,12 +1,4 @@ module ApplicationHelper - def home_page? - return false if user_signed_in? - - # Using path because fullpath yields false negatives since it contains - # parameters too - request.path == "/" - end - # if current path is /debates current_path_with_query_params(foo: "bar") returns /debates?foo=bar # notice: if query_params have a param which also exist in current path, # it "overrides" (query_params is merged last) diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb index 46db4522de4..1200b418a28 100644 --- a/app/helpers/documents_helper.rb +++ b/app/helpers/documents_helper.rb @@ -11,10 +11,6 @@ def bytes_to_mega(bytes) bytes / Numeric::MEGABYTE end - def document_nested_field_wrapper_id(index) - "document_#{index}" - end - def render_destroy_document_link(builder, document) if !document.persisted? && document.cached_attachment.present? link_to t("documents.form.delete_button"), diff --git a/app/helpers/imageables_helper.rb b/app/helpers/imageables_helper.rb index 529ee9cd701..f2ed56b094f 100644 --- a/app/helpers/imageables_helper.rb +++ b/app/helpers/imageables_helper.rb @@ -3,10 +3,6 @@ def can_destroy_image?(imageable) imageable.image.present? && can?(:destroy, imageable.image) end - def imageable_class(imageable) - imageable.class.name.parameterize(separator: "_") - end - def imageable_max_file_size bytes_to_megabytes(Setting["uploads.images.max_size"].to_i.megabytes) end diff --git a/app/helpers/images_helper.rb b/app/helpers/images_helper.rb index 179e02b1a6c..b265e10ad7c 100644 --- a/app/helpers/images_helper.rb +++ b/app/helpers/images_helper.rb @@ -17,10 +17,6 @@ def image_errors_on_attachment(image) image.errors[:attachment].join(", ") if image.errors.key?(:attachment) end - def image_bytes_to_megabytes(bytes) - bytes / Numeric::MEGABYTE - end - def image_class(image) image.persisted? ? "persisted-image" : "cached-image" end diff --git a/app/helpers/officers_helper.rb b/app/helpers/officers_helper.rb index 94eaf11459c..9e6a6bb47d6 100644 --- a/app/helpers/officers_helper.rb +++ b/app/helpers/officers_helper.rb @@ -1,8 +1,4 @@ module OfficersHelper - def officer_label(officer) - truncate([officer.name, officer.email].compact.join(" - "), length: 100) - end - def vote_collection_shift? current_user.poll_officer.officer_assignments.voting_days.where(date: Time.current.to_date).any? end diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb index a3de04ccf71..b69a9368fdb 100644 --- a/app/helpers/polls_helper.rb +++ b/app/helpers/polls_helper.rb @@ -19,22 +19,6 @@ def poll_dates(poll) end end - def poll_dates_select_options(poll) - options = [] - (poll.starts_at.to_date..poll.ends_at.to_date).each do |date| - options << [l(date, format: :long), l(date)] - end - options_for_select(options, params[:d]) - end - - def poll_booths_select_options(poll) - options = [] - poll.booths.each do |booth| - options << [booth_name_with_location(booth), booth.id] - end - options_for_select(options) - end - def booth_name_with_location(booth) location = booth.location.blank? ? "" : " (#{booth.location})" booth.name + location From 497b087072ee465c0e8f0eb6c53bbb25d98da5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 10 Nov 2019 00:07:26 +0100 Subject: [PATCH 4/5] Remove obsolete model It was replaced by Dashboard::AdministratorTask in commit e5f9cf67. --- app/models/administrator_task.rb | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 app/models/administrator_task.rb diff --git a/app/models/administrator_task.rb b/app/models/administrator_task.rb deleted file mode 100644 index 58185fbeaa2..00000000000 --- a/app/models/administrator_task.rb +++ /dev/null @@ -1,11 +0,0 @@ -class AdministratorTask < ApplicationRecord - belongs_to :source, polymorphic: true - belongs_to :user - - validates :source, presence: true - - default_scope { order(created_at: :asc) } - - scope :pending, -> { where(executed_at: nil) } - scope :done, -> { where.not(executed_at: nil) } -end From 216d9e61dc45faed73acb02f6a217a3914ec1177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Sun, 10 Nov 2019 00:19:05 +0100 Subject: [PATCH 5/5] Remove unused Voter methods AFAIK these methods were never used. In any case, the similar method `set_demographic_info` was added in commit 6c34599e. --- app/models/poll/voter.rb | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/app/models/poll/voter.rb b/app/models/poll/voter.rb index 02db44c2508..d760f0ccd0e 100644 --- a/app/models/poll/voter.rb +++ b/app/models/poll/voter.rb @@ -43,30 +43,5 @@ def set_document_info def set_denormalized_booth_assignment_id self.booth_assignment_id ||= officer_assignment&.booth_assignment_id end - - def in_census? - census_api_response.valid? - end - - def census_api_response - @census_api_response ||= CensusCaller.new.call(document_type, document_number) - end - - def fill_stats_fields - if in_census? - self.gender = census_api_response.gender - self.geozone_id = Geozone.select(:id).find_by(census_code: census_api_response.district_code)&.id - self.age = voter_age(census_api_response.date_of_birth) - end - end - - def voter_age(dob) - if dob.blank? - nil - else - now = Date.current - now.year - dob.year - (now.month > dob.month || (now.month == dob.month && now.day >= dob.day) ? 0 : 1) - end - end end end