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

Merge pull request #1443 from mlorb/ml-sci-2914

Browse source 
Allow org. administrators to invite them onto all projects [SCI-2914]
This commit is contained in:
mlorb 2019-01-24 16:24:57 +01:00 • committed by GitHub
commit a297ef2094
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/projects/index.js
View file

@ -11,7 +11,7 @@
I18n setupSidebarTree */ I18n setupSidebarTree */
//= require comments //= require comments
(function() { (function(global) {
var newProjectModal = null; var newProjectModal = null;
var newProjectModalForm = null; var newProjectModalForm = null;
var newProjectModalBody = null; var newProjectModalBody = null;
@ -203,7 +203,7 @@
} }
// Initialize users editing modal remote loading. // Initialize users editing modal remote loading.
function initUsersEditLink($el) { global.initUsersEditLink = function($el) {
$el.find('.manage-users-link') $el.find('.manage-users-link')
.on('ajax:before', function() { .on('ajax:before', function() {
var projectId = $(this).closest('.panel-default').attr('id'); var projectId = $(this).closest('.panel-default').attr('id');
@ -771,4 +771,4 @@
initProjectsViewModeSwitch(); initProjectsViewModeSwitch();
initSorting(); initSorting();
loadCardsView(); loadCardsView();
}()); }(window));

2
app/assets/stylesheets/themes/scinote.scss
View file

@ -783,7 +783,9 @@ ul.double-line > li {
} }
.manage-users-link { .manage-users-link {
display: block;
padding-left: 15px; padding-left: 15px;
margin-bottom: 10px;
} }
} }

2
app/views/user_projects/_index.html.erb
View file

@ -1,6 +1,6 @@
<h5 class="text-center"><%= t("projects.index.users_tab") %></h5> <h5 class="text-center"><%= t("projects.index.users_tab") %></h5>
<hr> <hr>
<ul class="no-style content-users"> <ul class="no-style content-users" data-hook="project-users-tab-list">
<% if @users.size == 0 then %> <% if @users.size == 0 then %>
<li><em><%= t 'projects.index.no_users' %></em></li> <li><em><%= t 'projects.index.no_users' %></em></li>
<% else %> <% else %>