From 47cb1b31dc8bb2d0fe7841f40480e9f48813d83e Mon Sep 17 00:00:00 2001 From: zmagoD Date: Sun, 2 May 2021 11:36:10 +0200 Subject: [PATCH] fix code style --- app/assets/javascripts/access_permissions/projects.js | 4 ++-- app/assets/javascripts/shared/autosave_form.js | 4 ++-- app/assets/javascripts/shared/filter_list.js | 2 +- app/assets/javascripts/shared/modal_close_redirect.js | 4 ++-- app/assets/javascripts/shared/remote_destroy.js | 2 +- app/assets/javascripts/shared/remote_modal.js | 8 ++++---- app/assets/javascripts/shared/replace_form.js | 2 +- app/assets/javascripts/shared/swap_remote_container.js | 2 +- app/assets/javascripts/shared/toggle_visibility.js | 2 +- app/assets/stylesheets/access_permissions/project.scss | 2 +- .../access_permissions/projects_controller.rb | 10 +++++----- app/forms/access_permissions/edit_user_project_form.rb | 1 - app/forms/access_permissions/new_user_project_form.rb | 6 +++--- app/models/user_role.rb | 2 +- .../access_permissions/projects/new.json.jbuilder | 1 - 15 files changed, 25 insertions(+), 27 deletions(-) diff --git a/app/assets/javascripts/access_permissions/projects.js b/app/assets/javascripts/access_permissions/projects.js index 1f0b8ed44..8e1a7354d 100644 --- a/app/assets/javascripts/access_permissions/projects.js +++ b/app/assets/javascripts/access_permissions/projects.js @@ -5,7 +5,7 @@ $(document).on('change', 'form#new-user-assignment-to-project-form', function() { let values = []; let count = 0; - let submitBtn = $(this).find('input[type="submit"]') + let submitBtn = $(this).find('input[type="submit"]'); $(this).find('input:checked').each((_, el) => { let select = $(el).closest('.row').find('select'); @@ -42,4 +42,4 @@ } $(document).one('turbolinks:load', initNewUserAssignmentFormListener); -})(); +}()); diff --git a/app/assets/javascripts/shared/autosave_form.js b/app/assets/javascripts/shared/autosave_form.js index 1806645fb..0e3dc5233 100644 --- a/app/assets/javascripts/shared/autosave_form.js +++ b/app/assets/javascripts/shared/autosave_form.js @@ -3,9 +3,9 @@ function initAutosaveListeners() { $(document).on('change', 'form[data-action*="autosave-form"]', function({ currentTarget }) { - $.rails.fire($(currentTarget), 'submit') + $.rails.fire($(currentTarget), 'submit'); }) } $(document).one('turbolinks:load', initAutosaveListeners); -})(); +}()); diff --git a/app/assets/javascripts/shared/filter_list.js b/app/assets/javascripts/shared/filter_list.js index c7d9d0844..2fa8e867e 100644 --- a/app/assets/javascripts/shared/filter_list.js +++ b/app/assets/javascripts/shared/filter_list.js @@ -17,4 +17,4 @@ } $(document).one('turbolinks:load', initFilterListListeners); -})(); +}()); diff --git a/app/assets/javascripts/shared/modal_close_redirect.js b/app/assets/javascripts/shared/modal_close_redirect.js index 139dc46c7..e8ebf4f76 100644 --- a/app/assets/javascripts/shared/modal_close_redirect.js +++ b/app/assets/javascripts/shared/modal_close_redirect.js @@ -4,9 +4,9 @@ function initModalCloseListeners() { $(document).on('hidden.bs.modal', '[data-action*="modal-close"]', function({ currentTarget }) { let targetPath = currentTarget.getAttribute('data-target'); - Turbolinks.visit(targetPath) + Turbolinks.visit(targetPath); }); } $(document).one('turbolinks:load', initModalCloseListeners); -})(); +}()); diff --git a/app/assets/javascripts/shared/remote_destroy.js b/app/assets/javascripts/shared/remote_destroy.js index 8f4b64a43..8763dcec5 100644 --- a/app/assets/javascripts/shared/remote_destroy.js +++ b/app/assets/javascripts/shared/remote_destroy.js @@ -16,4 +16,4 @@ } $(document).one('turbolinks:load', initRemoteDestroyListeners); -})(); +}()); diff --git a/app/assets/javascripts/shared/remote_modal.js b/app/assets/javascripts/shared/remote_modal.js index 829e3bb08..a6b4091f8 100644 --- a/app/assets/javascripts/shared/remote_modal.js +++ b/app/assets/javascripts/shared/remote_modal.js @@ -10,10 +10,10 @@ $(modal).modal('show') .on("shown.bs.modal", function() { $(this).find(".selectpicker").selectpicker(); - }) - }) - }) + }); + }); + }); } $(document).one('turbolinks:load', initRemoteModalListeners); -})(); +}()); diff --git a/app/assets/javascripts/shared/replace_form.js b/app/assets/javascripts/shared/replace_form.js index fa7f2666e..95362f91f 100644 --- a/app/assets/javascripts/shared/replace_form.js +++ b/app/assets/javascripts/shared/replace_form.js @@ -21,4 +21,4 @@ } $(document).one('turbolinks:load', initReplaceFormListeners); -})(); +}()); diff --git a/app/assets/javascripts/shared/swap_remote_container.js b/app/assets/javascripts/shared/swap_remote_container.js index 3faa28a99..1c613aedf 100644 --- a/app/assets/javascripts/shared/swap_remote_container.js +++ b/app/assets/javascripts/shared/swap_remote_container.js @@ -23,4 +23,4 @@ } $(document).one('turbolinks:load', initSwapRemoteContainerListeners); -})(); +}()); diff --git a/app/assets/javascripts/shared/toggle_visibility.js b/app/assets/javascripts/shared/toggle_visibility.js index 8d15c24d2..26987523f 100644 --- a/app/assets/javascripts/shared/toggle_visibility.js +++ b/app/assets/javascripts/shared/toggle_visibility.js @@ -15,4 +15,4 @@ } $(document).one('turbolinks:load', initToggleVisibilityListeners); -})(); +}()); diff --git a/app/assets/stylesheets/access_permissions/project.scss b/app/assets/stylesheets/access_permissions/project.scss index ff36666e0..e17a60030 100644 --- a/app/assets/stylesheets/access_permissions/project.scss +++ b/app/assets/stylesheets/access_permissions/project.scss @@ -2,8 +2,8 @@ .project-member-item { border-bottom: .1rem solid $btn-default-border; - padding: 10px; margin: 10px 0; + padding: 10px; &:last-child { border: 0; diff --git a/app/controllers/access_permissions/projects_controller.rb b/app/controllers/access_permissions/projects_controller.rb index 26245c8b7..ad4dc2646 100644 --- a/app/controllers/access_permissions/projects_controller.rb +++ b/app/controllers/access_permissions/projects_controller.rb @@ -3,8 +3,8 @@ module AccessPermissions class ProjectsController < ApplicationController before_action :set_project - before_action :check_read_permissions, only: %i[show] - before_action :check_manage_permissions, only: %i[new create edit update destroy] + before_action :check_read_permissions, only: %i(show) + before_action :check_manage_permissions, only: %i(new create edit update destroy) def new available_users = current_team.users.where.not(id: @project.users.pluck(:id)) @@ -79,16 +79,16 @@ module AccessPermissions def permitted_update_params params.require(:project_member) - .permit(%i[user_role_id user_id]) + .permit(%i(user_role_id user_id)) end def permitted_create_params params.require(:access_permissions_new_user_project_form) - .permit(resource_members: %i[assign user_id user_role_id]) + .permit(resource_members: %i(assign user_id user_role_id)) end def set_project - @project = current_team.projects.includes(user_assignments: [:user, :user_role]).find_by(id: params[:id]) + @project = current_team.projects.includes(user_assignments: %i(user user_role)).find_by(id: params[:id]) render_404 unless @project end diff --git a/app/forms/access_permissions/edit_user_project_form.rb b/app/forms/access_permissions/edit_user_project_form.rb index d67453730..b70845e95 100644 --- a/app/forms/access_permissions/edit_user_project_form.rb +++ b/app/forms/access_permissions/edit_user_project_form.rb @@ -20,4 +20,3 @@ module AccessPermissions end end end - diff --git a/app/forms/access_permissions/new_user_project_form.rb b/app/forms/access_permissions/new_user_project_form.rb index f41b9d385..deded453b 100644 --- a/app/forms/access_permissions/new_user_project_form.rb +++ b/app/forms/access_permissions/new_user_project_form.rb @@ -11,7 +11,7 @@ module AccessPermissions @project = project @users = attributes[:users] @current_user = current_user - set_resource_members if @users + default_resource_members if @users @error = false @new_members_count = 0 end @@ -27,7 +27,7 @@ module AccessPermissions def resource_members=(attributes) @resource_members ||= [] - attributes.fetch(:resource_members).each do |i, resource_member| + attributes.fetch(:resource_members).each do |_, resource_member| user = User.find(resource_member[:user_id]) project_member = ProjectMember.new(user, @project, current_user) project_member.assign = resource_member[:assign] @@ -40,7 +40,7 @@ module AccessPermissions private - def set_resource_members + def default_resource_members @resource_members ||= @users.order(:full_name).map { |u| ProjectMember.new(u, @project, current_user) } end end diff --git a/app/models/user_role.rb b/app/models/user_role.rb index 10a0c6c27..eafc1eb52 100644 --- a/app/models/user_role.rb +++ b/app/models/user_role.rb @@ -84,7 +84,7 @@ class UserRole < ApplicationRecord end def owner? - self.name == 'Owner' + name == 'Owner' end private diff --git a/app/views/access_permissions/projects/new.json.jbuilder b/app/views/access_permissions/projects/new.json.jbuilder index a70e12b80..0f30997b4 100644 --- a/app/views/access_permissions/projects/new.json.jbuilder +++ b/app/views/access_permissions/projects/new.json.jbuilder @@ -11,4 +11,3 @@ json.html controller.render_to_string( }, layout: false ) -