Will Bradley
d3b8ad7222
Conflicts: .gitignore Gemfile Gemfile.lock app/controllers/door_logs_controller.rb app/controllers/users_controller.rb app/models/user.rb app/views/door_logs/download.html.erb app/views/door_logs/show.html.erb app/views/layouts/application.html.erb app/views/users/show.html.erb app/views/users/upload.html.erb app/views/users/upload_all.html.erb config/environments/development.rb config/environments/production.rb config/routes.rb db/schema.rb
33 lines
585 B
Plaintext
33 lines
585 B
Plaintext
<<<<<<< HEAD
|
|
<p id="notice"><%= notice %></p>
|
|
=======
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
|
|
<p>
|
|
<b>Name:</b>
|
|
<%= @user.name %>
|
|
</p>
|
|
|
|
<p>
|
|
<b>Card DB ID:</b>
|
|
<%= @user.card_id %>
|
|
</p>
|
|
|
|
<p>
|
|
<b>Card Number:</b>
|
|
<%= @user.card_number %>
|
|
</p>
|
|
|
|
<p>
|
|
<b>Card Permissions:</b>
|
|
<%= @user.card_permissions %>
|
|
</p>
|
|
|
|
<<<<<<< HEAD
|
|
<%= link_to 'Upload to Door', upload_path(user) %>
|
|
=======
|
|
<%= link_to 'Upload to Door', upload_path(@user) %>
|
|
>>>>>>> 03d99741e5b661e63f6281115d2db333082a09b1
|
|
<%= link_to 'Edit', edit_user_path(@user) %> |
|
|
<%= link_to 'Back', users_path %>
|