scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Code styling (use link_to, %w)

Browse source
This commit is contained in:
Luka Murn 2016-11-08 16:43:25 +01:00
parent 9438ba7e10
commit b246853117
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/users/settings/organization.js
View file

@ -238,7 +238,7 @@ function initRemoveUsers() {
function initReloadPageAfterInviteUsers() { function initReloadPageAfterInviteUsers() {
$('[data-id=org-invite-users-modal]') $('[data-id=org-invite-users-modal]')
.on('hidden.bs.modal', function() { .on('hidden.bs.modal', function() {
if ($(this).attr('data-invited') !== undefined) { if (!_.isUndefined($(this).attr('data-invited'))) {
// Reload the whole table // Reload the whole table
usersDatatable.ajax.reload(); usersDatatable.ajax.reload();
} }

27
app/views/shared/_invite_users_modal.html.erb
View file

@ -22,6 +22,7 @@
<% <%
text_title ||= nil text_title ||= nil
text_invite_heading ||= nil text_invite_heading ||= nil
invite_to_org = type.in?(%w(invite_to_org invite_to_org_with_role))
%> %>
<div <div
class="modal modal-invite-users" class="modal modal-invite-users"
@ -34,8 +35,8 @@ text_invite_heading ||= nil
data-url="<%= invite_users_path %>" data-url="<%= invite_users_path %>"
data-backdrop="static" data-backdrop="static"
data-keyboard="false" data-keyboard="false"
<%= "data-organization-id=#{organization.id}" if type.in?(['invite_to_org', 'invite_to_org_with_role']) %> <%= "data-organization-id=#{organization.id}" if invite_to_org %>
<%= "data-organization-role=#{role}" if type.in?(['invite_to_org_with_role', 'invite_with_org_selector_and_role']) %> <%= "data-organization-role=#{role}" if type.in?(%w(invite_to_org_with_role invite_with_org_selector_and_role)) %>
> >
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
@ -46,7 +47,7 @@ text_invite_heading ||= nil
<% if text_title %> <% if text_title %>
<%= text_title %> <%= text_title %>
<% else %> <% else %>
<% if type.in?(['invite_to_org', 'invite_to_org_with_role']) %> <% if invite_to_org %>
<%= t('invite_users.to_org.title', organization: organization.name) %> <%= t('invite_users.to_org.title', organization: organization.name) %>
<% else %> <% else %>
<%= t('invite_users.no_org.title') %> <%= t('invite_users.no_org.title') %>
@ -61,7 +62,7 @@ text_invite_heading ||= nil
<% if text_invite_heading %> <% if text_invite_heading %>
<%= text_invite_heading %> <%= text_invite_heading %>
<% else %> <% else %>
<% if type.in?(['invite_to_org', 'invite_to_org_with_role']) %> <% if invite_to_org %>
<%= t('invite_users.to_org.heading', organization: organization.name) %> <%= t('invite_users.to_org.heading', organization: organization.name) %>
<% else %> <% else %>
<%= t('invite_users.no_org.heading') %> <%= t('invite_users.no_org.heading') %>
@ -120,15 +121,15 @@ text_invite_heading ||= nil
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li><a href="#" data-action="invite" data-organization-role="guest"> <li>
<%= t("invite_users.invite_guest") %> <%= link_to t('invite_users.invite_guest'), '#', data: { action: 'invite', 'organization-role' => 'guest' } %>
</a></li> </li>
<li><a href="#" data-action="invite" data-organization-role="normal_user"> <li>
<%= t("invite_users.invite_user") %> <%= link_to t('invite_users.invite_user'), '#', data: { action: 'invite', 'organization-role' => 'normal_user' } %>
</a></li> </li>
<li><a href="#" data-action="invite" data-organization-role="admin"> <li>
<%= t("invite_users.invite_admin") %> <%= link_to t('invite_users.invite_admin'), '#', data: { action: 'invite', 'organization-role' => 'admin' } %>
</a></li> </li>
</ul> </ul>
</div> </div>
</div> </div>