scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-19 05:47:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #917 from okriuchykhin/ok_SCI_1870

Browse source 
Fix adding users to a task [SCI-1870]
This commit is contained in:
okriuchykhin 2018-01-04 14:14:05 +01:00 committed by GitHub
commit b0f8c36677
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/user_my_modules_controller.rb
View file

@ -44,7 +44,7 @@ class UserMyModulesController < ApplicationController
if @um.save if @um.save
# Create activity # Create activity
message = t( message = t(
"activities.assign_user_to_module", 'activities.assign_user_to_module',
assigned_user: @um.user.full_name, assigned_user: @um.user.full_name,
module: @my_module.name, module: @my_module.name,
assigned_by_user: current_user.full_name assigned_by_user: current_user.full_name
@ -58,9 +58,11 @@ class UserMyModulesController < ApplicationController
type_of: :assign_user_to_module type_of: :assign_user_to_module
) )
respond_to do |format| respond_to do |format|
format.json { format.json do
redirect_to :action => :index_edit, :format => :json redirect_to my_module_users_edit_path(format: :json),
} turbolinks: false,
status: 303
end
end end
else else
respond_to do |format| respond_to do |format|

4
app/views/my_modules/modals/_manage_users_modal.html.erb
View file

@ -9,7 +9,9 @@
<div class="modal-footer"> <div class="modal-footer">
<span class="pull-left"> <span class="pull-left">
<% if is_admin_of_team(@experiment.project.team) %> <% if is_admin_of_team(@experiment.project.team) %>
<%= link_to t("experiments.canvas.full_zoom.modal_manage_users.invite_users_link"), team_path(@experiment.project.team.id) %> <%= link_to t("experiments.canvas.full_zoom.modal_manage_users.invite_users_link"),
"/settings/teams/#{@experiment.project.team.id}",
data: { turbolinks: false } %>
<span><%=t "experiments.canvas.full_zoom.modal_manage_users.invite_users_details", team: @experiment.project.team.name %></span> <span><%=t "experiments.canvas.full_zoom.modal_manage_users.invite_users_details", team: @experiment.project.team.name %></span>
<% else %> <% else %>
<i><%=t "experiments.canvas.full_zoom.modal_manage_users.contact_admins", team: @experiment.project.team.name %></i> <i><%=t "experiments.canvas.full_zoom.modal_manage_users.contact_admins", team: @experiment.project.team.name %></i>