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

fixed new user registration

Browse source
This commit is contained in:
zmagod 2016-10-12 12:02:04 +02:00
parent 8cd86a50bb
commit 8f24d0d80c
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/users/registrations_controller.rb
View file

@ -158,6 +158,10 @@ class Users::RegistrationsController < Devise::RegistrationsController
organization: @org, organization: @org,
role: :admin role: :admin
) )
# set current organization to new user
resource.current_organization_id = @org.id
resource.save
end end
end end

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

@ -101,10 +101,12 @@
</li> </li>
<!-- Global team switch --> <!-- Global team switch -->
<% if current_user.organizations.length > 1 %>
<li class="dropdown" id="team-switch"> <li class="dropdown" id="team-switch">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
<span><%= current_organization.name %></span> <span><%= current_organization.name %></span>
</a> </a>
<ul class="dropdown-menu "> <ul class="dropdown-menu ">
<%= form_for(current_user, <%= form_for(current_user,
url: user_current_organization_path, url: user_current_organization_path,
@ -117,6 +119,7 @@
<% end %> <% end %>
</ul> </ul>
</li> </li>
<% end %>
<!-- greetings --> <!-- greetings -->
<li class="dropdown"> <li class="dropdown">