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 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/sessions_controller.rb')

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
-- 
cgit v1.2.3


From 8e3e46b7951120f1ec34949d607a7672ad03f820 Mon Sep 17 00:00:00 2001
From: shumakl <shumakl@purdue.edu>
Date: Thu, 3 Apr 2014 11:52:05 -0400
Subject: run generate.sh

---
 app/controllers/sessions_controller.rb | 124 ++++++++++++++++-----------------
 1 file changed, 62 insertions(+), 62 deletions(-)

(limited to 'app/controllers/sessions_controller.rb')

diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 7df8a9a..b035ea0 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -1,74 +1,74 @@
 class SessionsController < ApplicationController
-  before_action :set_session, only: [:show, :edit, :update, :destroy]
+	before_action :set_session, only: [:show, :edit, :update, :destroy]
 
-  # GET /sessions
-  # GET /sessions.json
-  def index
-    @sessions = Session.all
-  end
+	# GET /sessions
+	# GET /sessions.json
+	def index
+		@sessions = Session.all
+	end
 
-  # GET /sessions/1
-  # GET /sessions/1.json
-  def show
-  end
+	# GET /sessions/1
+	# GET /sessions/1.json
+	def show
+	end
 
-  # GET /sessions/new
-  def new
-    @session = Session.new
-  end
+	# GET /sessions/new
+	def new
+		@session = Session.new
+	end
 
-  # GET /sessions/1/edit
-  def edit
-  end
+	# GET /sessions/1/edit
+	def edit
+	end
 
-  # POST /sessions
-  # POST /sessions.json
-  def create
-    @session = Session.new(session_params)
+	# POST /sessions
+	# POST /sessions.json
+	def create
+		@session = Session.new(session_params)
 
-    respond_to do |format|
-      if @session.save
-        format.html { redirect_to @session, notice: 'Session was successfully created.' }
-        format.json { render action: 'show', status: :created, location: @session }
-      else
-        format.html { render action: 'new' }
-        format.json { render json: @session.errors, status: :unprocessable_entity }
-      end
-    end
-  end
+		respond_to do |format|
+			if @session.save
+				format.html { redirect_to @session, notice: 'Session was successfully created.' }
+				format.json { render action: 'show', status: :created, location: @session }
+			else
+				format.html { render action: 'new' }
+				format.json { render json: @session.errors, status: :unprocessable_entity }
+			end
+		end
+	end
 
-  # PATCH/PUT /sessions/1
-  # PATCH/PUT /sessions/1.json
-  def update
-    respond_to do |format|
-      if @session.update(session_params)
-        format.html { redirect_to @session, notice: 'Session was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render action: 'edit' }
-        format.json { render json: @session.errors, status: :unprocessable_entity }
-      end
-    end
-  end
+	# PATCH/PUT /sessions/1
+	# PATCH/PUT /sessions/1.json
+	def update
+		respond_to do |format|
+			if @session.update(session_params)
+				format.html { redirect_to @session, notice: 'Session was successfully updated.' }
+				format.json { head :no_content }
+			else
+				format.html { render action: 'edit' }
+				format.json { render json: @session.errors, status: :unprocessable_entity }
+			end
+		end
+	end
 
-  # DELETE /sessions/1
-  # DELETE /sessions/1.json
-  def destroy
-    @session.destroy
-    respond_to do |format|
-      format.html { redirect_to sessions_url }
-      format.json { head :no_content }
-    end
-  end
+	# DELETE /sessions/1
+	# DELETE /sessions/1.json
+	def destroy
+		@session.destroy
+		respond_to do |format|
+			format.html { redirect_to sessions_url }
+			format.json { head :no_content }
+		end
+	end
 
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_session
-      @session = Session.find(params[:id])
-    end
+	private
+	# Use callbacks to share common setup or constraints between actions.
+	def set_session
+		@session = Session.find(params[:id])
+	end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def session_params
-      params.require(:session).permit(:user_id, :token)
-    end
+	# Never trust parameters from the scary internet, only allow the white list through.
+	def session_params
+		params.require(:session).permit(:user_id, :token)
+	end
 end
-- 
cgit v1.2.3