scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-06 12:43:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

sets current_organization_id if no current_organization is available for current_user, hides separator if only one team present [fixes SCI-608]

Browse source
This commit is contained in:
zmagod 2016-10-24 21:20:41 +02:00
parent bb903956a8
commit 24b81c96f6
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/projects_controller.rb
View file

@ -30,7 +30,9 @@ class ProjectsController < ApplicationController
end end
if current_user.organizations.any? if current_user.organizations.any?
@current_organization_id = current_organization.id @current_organization_id = current_organization.id if current_organization
@current_organization_id ||= current_user.organizations.first.id
@current_sort = params[:sort].to_s @current_sort = params[:sort].to_s
@projects_by_orgs = current_user @projects_by_orgs = current_user
.projects_by_orgs(@current_organization_id, .projects_by_orgs(@current_organization_id,

2
app/views/shared/_navigation.html.erb
View file

@ -87,7 +87,9 @@
</li> </li>
<% end %> <% end %>
<% end %> <% end %>
<% if current_user.organizations.length > 1 %>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<% end %>
<li> <li>
<%= link_to new_organization_path do %> <%= link_to new_organization_path do %>
<span class="glyphicon glyphicon-plus"></span> <span class="glyphicon glyphicon-plus"></span>