mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-09-09 06:35:37 +08:00
fix code style
This commit is contained in:
parent
c1d98f421d
commit
47cb1b31dc
15 changed files with 25 additions and 27 deletions
|
@ -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);
|
||||
})();
|
||||
}());
|
||||
|
|
|
@ -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);
|
||||
})();
|
||||
}());
|
||||
|
|
|
@ -17,4 +17,4 @@
|
|||
}
|
||||
|
||||
$(document).one('turbolinks:load', initFilterListListeners);
|
||||
})();
|
||||
}());
|
||||
|
|
|
@ -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);
|
||||
})();
|
||||
}());
|
||||
|
|
|
@ -16,4 +16,4 @@
|
|||
}
|
||||
|
||||
$(document).one('turbolinks:load', initRemoteDestroyListeners);
|
||||
})();
|
||||
}());
|
||||
|
|
|
@ -10,10 +10,10 @@
|
|||
$(modal).modal('show')
|
||||
.on("shown.bs.modal", function() {
|
||||
$(this).find(".selectpicker").selectpicker();
|
||||
})
|
||||
})
|
||||
})
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
$(document).one('turbolinks:load', initRemoteModalListeners);
|
||||
})();
|
||||
}());
|
||||
|
|
|
@ -21,4 +21,4 @@
|
|||
}
|
||||
|
||||
$(document).one('turbolinks:load', initReplaceFormListeners);
|
||||
})();
|
||||
}());
|
||||
|
|
|
@ -23,4 +23,4 @@
|
|||
}
|
||||
|
||||
$(document).one('turbolinks:load', initSwapRemoteContainerListeners);
|
||||
})();
|
||||
}());
|
||||
|
|
|
@ -15,4 +15,4 @@
|
|||
}
|
||||
|
||||
$(document).one('turbolinks:load', initToggleVisibilityListeners);
|
||||
})();
|
||||
}());
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -20,4 +20,3 @@ module AccessPermissions
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -84,7 +84,7 @@ class UserRole < ApplicationRecord
|
|||
end
|
||||
|
||||
def owner?
|
||||
self.name == 'Owner'
|
||||
name == 'Owner'
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -11,4 +11,3 @@ json.html controller.render_to_string(
|
|||
},
|
||||
layout: false
|
||||
)
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue