scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-01 17:34:59 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1270 from okriuchykhin/ok_SCI_2651

Browse source 
Refactor invite users modal initialization [SCI-2651]
This commit is contained in:
Alex Kriuchykhin 2018-08-23 14:34:42 +02:00 • committed by GitHub
commit 151d1cf44d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/users/settings/teams/invite_users_modal.js
View file

@ -164,8 +164,10 @@
} }
function initializeModalsToggle() { function initializeModalsToggle() {
$("[data-trigger='invite-users']").on('click', function() { $("[data-trigger='invite-users']").on('click', function(event) {
var id = $(this).attr('data-modal-id'); var id = $(this).attr('data-modal-id');
event.preventDefault();
event.stopPropagation();
$('[data-role=invite-users-modal][data-id=' + id + ']') $('[data-role=invite-users-modal][data-id=' + id + ']')
.modal('show'); .modal('show');
}); });

2
app/assets/javascripts/users/settings/teams/show.js
View file

@ -1,5 +1,3 @@
//= require users/settings/teams/invite_users_modal
(function() { (function() {
'use strict'; 'use strict';

3
app/views/users/settings/teams/show.html.erb
View file

@ -93,7 +93,7 @@
<div class="panel-body"> <div class="panel-body">
<div class="col-xs-24 col-sm-12"> <div class="col-xs-24 col-sm-12">
<a href="#" class="btn btn-primary pull-right row" data-trigger="invite-users" <a href="#" class="btn btn-primary pull-right row" data-trigger="invite-users"
data-modal-id="team-invite-users-modal" data-remote="true"> data-modal-id="team-invite-users-modal">
<span class="fas fa-plus"></span> <span class="fas fa-plus"></span>
<%= t("users.settings.teams.edit.add_user") %> <%= t("users.settings.teams.edit.add_user") %>
</a> </a>
@ -137,4 +137,5 @@
<%= render partial: 'users/settings/user_teams/destroy_user_team_modal.html.erb' %> <%= render partial: 'users/settings/user_teams/destroy_user_team_modal.html.erb' %>
<%= stylesheet_link_tag 'datatables' %> <%= stylesheet_link_tag 'datatables' %>
<%= javascript_include_tag 'users/settings/teams/show' %> <%= javascript_include_tag 'users/settings/teams/show' %>
<%= javascript_include_tag 'users/settings/teams/invite_users_modal' %>
<span data-hook="team-bottom"></span> <span data-hook="team-bottom"></span>

2
config/initializers/assets.rb
View file

@ -28,6 +28,8 @@ Rails.application.config.assets.precompile +=
Rails.application.config.assets.precompile += Rails.application.config.assets.precompile +=
%w(users/settings/teams/add_user_modal.js) %w(users/settings/teams/add_user_modal.js)
Rails.application.config.assets.precompile += %w(users/settings/teams/show.js) Rails.application.config.assets.precompile += %w(users/settings/teams/show.js)
Rails.application.config.assets.precompile +=
%w(users/settings/teams/invite_users_modal.js)
Rails.application.config.assets.precompile += %w(my_modules/activities.js) Rails.application.config.assets.precompile += %w(my_modules/activities.js)
Rails.application.config.assets.precompile += %w(my_modules/protocols.js) Rails.application.config.assets.precompile += %w(my_modules/protocols.js)
Rails.application.config.assets.precompile += Rails.application.config.assets.precompile +=