From 64bb6a6491bd86fd38d286605629c0955cafb512 Mon Sep 17 00:00:00 2001
From: Mike Green <mike@fifthroomcreative.com>
Date: Fri, 15 Feb 2008 01:59:39 -0500
Subject: [PATCH] added filter to application controller for authentication,
 created model associations

---
 Folio.tmproj                   | 42 +++++++++++++++++++++++++++++++-----------
 app/controllers/application.rb |  5 ++++-
 app/models/category.rb         |  1 +
 app/models/client.rb           |  1 +
 app/models/project.rb          |  4 ++++
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/Folio.tmproj b/Folio.tmproj
index 2002fcb..e5b4f78 100644
--- a/Folio.tmproj
+++ b/Folio.tmproj
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>currentDocument</key>
-	<string>app/controllers/account_controller.rb</string>
+	<string>app/controllers/projects_controller.rb</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -26,23 +26,39 @@
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>0</integer>
+				<integer>34</integer>
 				<key>line</key>
-				<integer>0</integer>
+				<integer>4</integer>
 			</dict>
+			<key>columnSelection</key>
+			<false/>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
+			<key>selectFrom</key>
+			<dict>
+				<key>column</key>
+				<integer>2</integer>
+				<key>line</key>
+				<integer>4</integer>
+			</dict>
+			<key>selectTo</key>
+			<dict>
+				<key>column</key>
+				<integer>34</integer>
+				<key>line</key>
+				<integer>4</integer>
+			</dict>
 		</dict>
 		<key>app/controllers/application.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>0</integer>
+				<integer>1</integer>
 				<key>line</key>
-				<integer>10</integer>
+				<integer>5</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
@@ -63,28 +79,28 @@
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>app/models/category.rb</key>
+		<key>app/controllers/clients_controller.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>29</integer>
+				<integer>0</integer>
 				<key>line</key>
-				<integer>3</integer>
+				<integer>0</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>app/models/project.rb</key>
+		<key>app/controllers/projects_controller.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
 				<integer>0</integer>
 				<key>line</key>
-				<integer>7</integer>
+				<integer>0</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
@@ -123,10 +139,14 @@
 	<key>openDocuments</key>
 	<array>
 		<string>app/controllers/account_controller.rb</string>
+		<string>app/controllers/categories_controller.rb</string>
+		<string>app/controllers/clients_controller.rb</string>
+		<string>app/controllers/projects_controller.rb</string>
+		<string>app/controllers/application.rb</string>
 	</array>
 	<key>showFileHierarchyDrawer</key>
 	<true/>
 	<key>windowFrame</key>
-	<string>{{216, 73}, {926, 789}}</string>
+	<string>{{138, 71}, {926, 789}}</string>
 </dict>
 </plist>
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 07ed80d..bde9c2d 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -2,9 +2,12 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
-  helper :all # include all helpers, all the time
+  before_filter :login_from_cookie
+	helper :all # include all helpers, all the time
 
   # See ActionController::RequestForgeryProtection for details
   # Uncomment the :secret if you're not using the cookie session store
   protect_from_forgery # :secret => '2fa76b213c12006c33dd29f05e672d4e'
+	
+	
 end
diff --git a/app/models/category.rb b/app/models/category.rb
index 910a009..7512ed1 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -1,2 +1,3 @@
 class Category < ActiveRecord::Base
+	has_many :projects
 end
diff --git a/app/models/client.rb b/app/models/client.rb
index 998b2e4..485126e 100644
--- a/app/models/client.rb
+++ b/app/models/client.rb
@@ -1,2 +1,3 @@
 class Client < ActiveRecord::Base
+	has_many :projects
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 5bc7957..5ae7322 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,2 +1,6 @@
 class Project < ActiveRecord::Base
+	acts_as_taggable
+	
+	belongs_to :category
+	belongs_to :client
 end
-- 
2.11.4.GIT