Skip to content

Commit

Permalink
Revert code revert made during merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ZachariahMathews committed Nov 24, 2019
1 parent 28eb0da commit caf4c6c
Showing 1 changed file with 3 additions and 15 deletions.
18 changes: 3 additions & 15 deletions app/views/users/list.html.erb
Expand Up @@ -34,18 +34,6 @@
<% end -%>
</table>
</div>
<hr/>

<hr/>
<%= render :partial => 'shared_scripts/pages' %>

<p>
<%
session[:return_to] = "#{request.protocol}#{request.host_with_port}#{request.fullpath}"
%>
<%= link_to 'New user',:role => "Student", :action => 'new' %> |
<%= link_to 'Import users', :controller=>'import_file', :action=>'start', :model => 'User', :expected_fields => 'username&nbsp;&nbsp;|&nbsp;&nbsp;full name (first [middle] last)&nbsp;&nbsp;|&nbsp;&nbsp;e-mail address' %> |
<%= link_to 'Export users', :controller=>'export_file',:action=>'start',:model=> 'User',:id=> 1 %>

</p>
<br/>
<% session[:return_to] = "#{request.protocol}#{request.host_with_port}#{request.fullpath}" %>
<%= render :partial => 'links' %>

0 comments on commit caf4c6c

Please sign in to comment.