scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-07 21:55:20 +08:00
Code Issues Projects Releases Packages Wiki Activity

update extends and remove format from links

Browse source
This commit is contained in:
zmagoD 2021-06-27 09:45:32 +02:00
parent 9b87fce840
commit a678f07b47
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/access_permissions/partials/_project_member_field.html.erb
View file

@ -25,7 +25,7 @@
</div>
<div class="col-xs-5">
<% unless project_member.last_project_owner? %>
<%= link_to access_permissions_project_path(project, user_id: user, format: :json), remote: true, method: :delete, class: 'btn btn-link', data: { action: 'remote-destroy', target: "##{item_id}" } do %>
<%= link_to access_permissions_project_path(project, user_id: user), remote: true, method: :delete, class: 'btn btn-link', data: { action: 'remote-destroy', target: "##{item_id}" } do %>
<span class="fas fa-times"></span>
<%= t 'general.remove' %>
<% end %>

8
app/views/access_permissions/projects/edit.json.jbuilder
View file

@ -5,8 +5,8 @@ json.modal controller.render_to_string(
formats: [:html],
locals: {
project: @project,
update_path: access_permissions_project_path(@project, format: :json),
new_resource_path: new_access_permissions_project_path(id: @project, format: :json)
update_path: access_permissions_project_path(@project),
new_resource_path: new_access_permissions_project_path(id: @project)
},
layout: false
)
@ -16,8 +16,8 @@ modal_container = controller.render_to_string(
formats: [:html],
locals: {
project: @project,
update_path: access_permissions_project_path(@project, format: :json),
new_resource_path: new_access_permissions_project_path(id: @project, format: :json)
update_path: access_permissions_project_path(@project),
new_resource_path: new_access_permissions_project_path(id: @project)
},
layout: false
)

4
app/views/access_permissions/projects/new.json.jbuilder
View file

@ -6,8 +6,8 @@ json.html controller.render_to_string(
locals: {
resource: @project,
form_object: @form,
create_path: access_permissions_projects_path(id: @project.id, format: :json),
resource_path: edit_access_permissions_project_path(@project, format: :json)
create_path: access_permissions_projects_path(id: @project.id),
resource_path: edit_access_permissions_project_path(@project)
},
layout: false
)

2
app/views/access_permissions/projects/project_member.json.jbuilder
View file

@ -6,7 +6,7 @@ json.form controller.render_to_string(
locals: {
user: @form.user,
project: @project,
update_path: access_permissions_project_path(@project, format: :json)
update_path: access_permissions_project_path(@project)
},
layout: false
)

2
app/views/projects/index/_project_actions_dropdown.html.erb
View file

@ -51,7 +51,7 @@
<!-- Project members access -->
<% if can_read_project?(project) %>
<li class="form-dropdown-item">
<%= link_to can_manage_project_access?(project) ? edit_access_permissions_project_path(project, format: :json) : access_permissions_project_path(project, format: :json),
<%= link_to can_manage_project_access?(project) ? edit_access_permissions_project_path(project) : access_permissions_project_path(project),
class: 'btn btn-light',
data: { action: 'remote-modal'} do %>
<i class="fas fa-door-open"></i>

4
app/views/projects/index/_project_card.html.erb
View file

@ -51,14 +51,14 @@
<span class="card-label"><%= t('projects.index.card.users') %></span>
<div class="value">
<% if can_manage_project_access?(project) %>
<%= link_to edit_access_permissions_project_path(project, format: :json), class: 'project-users-link', data: { action: 'remote-modal' } do %>
<%= link_to edit_access_permissions_project_path(project), class: 'project-users-link', data: { action: 'remote-modal' } do %>
<%= render partial: 'projects/index/users_list.html.erb', locals: { project: project } %>
<span class="new-user global-avatar-container">
<i class="fas fa-plus"></i>
</span>
<% end %>
<% else %>
<%= link_to access_permissions_project_path(project, format: :json), class: 'project-users-link', data: { action: 'remote-modal' } do %>
<%= link_to access_permissions_project_path(project), class: 'project-users-link', data: { action: 'remote-modal' } do %>
<%= render partial: 'projects/index/users_list.html.erb', locals: { project: project } %>
<% end %>
<% end %>

4
config/initializers/extends.rb
View file

@ -382,8 +382,8 @@ class Extends
move_project_folder: 160,
rename_project_folder: 161,
delete_project_folder: 162,
change_user_role_on_experiment: 163,
change_user_role_on_my_module: 164
change_user_role_on_experiment: 165,
change_user_role_on_my_module: 166
}
ACTIVITY_GROUPS = {