From ef22599880973aae8464bacb82e3a04d6277bc43 Mon Sep 17 00:00:00 2001
From: shumakl <shumakl@purdue.edu>
Date: Thu, 3 Apr 2014 11:19:10 -0400
Subject: Move things around between users and sessions

---
 app/controllers/sessions_controller.rb | 2 +-
 app/views/sessions/_form.html.erb      | 4 ++++
 app/views/sessions/index.html.erb      | 2 ++
 app/views/sessions/index.json.jbuilder | 2 +-
 app/views/sessions/show.html.erb       | 5 +++++
 app/views/sessions/show.json.jbuilder  | 2 +-
 6 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 2f72bf7..7df8a9a 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -69,6 +69,6 @@ class SessionsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def session_params
-      params.require(:session).permit(:user_id)
+      params.require(:session).permit(:user_id, :token)
     end
 end
diff --git a/app/views/sessions/_form.html.erb b/app/views/sessions/_form.html.erb
index 1b94e77..90ad0ad 100644
--- a/app/views/sessions/_form.html.erb
+++ b/app/views/sessions/_form.html.erb
@@ -15,6 +15,10 @@
     <%= f.label :user_id %><br>
     <%= f.text_field :user_id %>
   </div>
+  <div class="field">
+    <%= f.label :token %><br>
+    <%= f.text_field :token %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>
diff --git a/app/views/sessions/index.html.erb b/app/views/sessions/index.html.erb
index 707a47d..43a7e1f 100644
--- a/app/views/sessions/index.html.erb
+++ b/app/views/sessions/index.html.erb
@@ -4,6 +4,7 @@
   <thead>
     <tr>
       <th>User</th>
+      <th>Token</th>
       <th></th>
       <th></th>
       <th></th>
@@ -14,6 +15,7 @@
     <% @sessions.each do |session| %>
       <tr>
         <td><%= session.user %></td>
+        <td><%= session.token %></td>
         <td><%= link_to 'Show', session %></td>
         <td><%= link_to 'Edit', edit_session_path(session) %></td>
         <td><%= link_to 'Destroy', session, method: :delete, data: { confirm: 'Are you sure?' } %></td>
diff --git a/app/views/sessions/index.json.jbuilder b/app/views/sessions/index.json.jbuilder
index 18fd4fa..5205ede 100644
--- a/app/views/sessions/index.json.jbuilder
+++ b/app/views/sessions/index.json.jbuilder
@@ -1,4 +1,4 @@
 json.array!(@sessions) do |session|
-  json.extract! session, :id, :user_id
+  json.extract! session, :id, :user_id, :token
   json.url session_url(session, format: :json)
 end
diff --git a/app/views/sessions/show.html.erb b/app/views/sessions/show.html.erb
index 5176869..230e6bd 100644
--- a/app/views/sessions/show.html.erb
+++ b/app/views/sessions/show.html.erb
@@ -5,5 +5,10 @@
   <%= @session.user %>
 </p>
 
+<p>
+  <strong>Token:</strong>
+  <%= @session.token %>
+</p>
+
 <%= link_to 'Edit', edit_session_path(@session) %> |
 <%= link_to 'Back', sessions_path %>
diff --git a/app/views/sessions/show.json.jbuilder b/app/views/sessions/show.json.jbuilder
index 4ebf936..c9efd3b 100644
--- a/app/views/sessions/show.json.jbuilder
+++ b/app/views/sessions/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @session, :id, :user_id, :created_at, :updated_at
+json.extract! @session, :id, :user_id, :token, :created_at, :updated_at
-- 
cgit v1.2.3