ActionItem6: affiliation added

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@184 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem6: affiliation added
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@184 3f533792-8f58-4932-b0fe-aaf55b0a4547
MoisesMachado
1 parent 9ddf3eb1
Showing 7 changed files with 37 additions and 7 deletions Show diff stats
app/controllers/application.rb
app/controllers/enterprise_controller.rb
app/models/affiliation.rb
db/migrate/007_create_enterprises.rb
db/migrate/008_create_affiliations.rb
test/fixtures/affiliations.yml
test/unit/affiliation_test.rb
@@ -12,9 +12,7 @@ class ApplicationController &lt; ActionController::Base
     # Load the owner 
   def load_owner
     # TODO: this should not be hardcoded
-    if Profile.exists?(1)
-      @owner = Profile.find(1) 
-    end
+    @owner = Profile.find(1) if Profile.exists?(1)
   end
  
   protected
@@ -30,10 +28,6 @@ class ApplicationController &lt; ActionController::Base
     end
   end
  
-  def flexible_template_onwer
-    @virtual_community_admin || @profile
-  end
-
   def self.acts_as_virtual_community_admin_controller
     before_filter :load_admin_controller
   end
 # Manage enterprises by providing an interface to register, activate and manage them
 class EnterpriseController < ApplicationController
  
+  def index
+    @my_enterprises = current_user.enterprises
+  end
+  
   def register
     unless logged_in?
       redirect_to :controller => 'account'
@@ -0,0 +1,4 @@
+class Affiliation < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :enterprise
+end
@@ -11,6 +11,7 @@ class CreateEnterprises &lt; ActiveRecord::Migration
       t.column :economic_activity,       :string
       t.column :management_information,  :string
       t.column :active,                  :boolean, :default => "false"
+      t.column :manager_id,              :integer
     end
   end
  
@@ -0,0 +1,12 @@
+class CreateAffiliations < ActiveRecord::Migration
+  def self.up
+    create_table :affiliations do |t|
+      t.column :user_id,         :integer
+      t.column :enterprise_id,   :integer
+    end
+  end
+
+  def self.down
+    drop_table :affiliations
+  end
+end
@@ -0,0 +1,5 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+two:
+  id: 2
@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class AffiliationTest < Test::Unit::TestCase
+  fixtures :affiliations
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
...	...	@@ -12,9 +12,7 @@ class ApplicationController < ActionController::Base
12	12	# Load the owner
13	13	def load_owner
14	14	# TODO: this should not be hardcoded
15		- if Profile.exists?(1)
16		- @owner = Profile.find(1)
17		- end
	15	+ @owner = Profile.find(1) if Profile.exists?(1)
18	16	end
19	17
20	18	protected
...	...	@@ -30,10 +28,6 @@ class ApplicationController < ActionController::Base
30	28	end
31	29	end
32	30
33		- def flexible_template_onwer
34		- @virtual_community_admin \|\| @profile
35		- end
36		-
37	31	def self.acts_as_virtual_community_admin_controller
38	32	before_filter :load_admin_controller
39	33	end
...	...
1	1	# Manage enterprises by providing an interface to register, activate and manage them
2	2	class EnterpriseController < ApplicationController
3	3
	4	+ def index
	5	+ @my_enterprises = current_user.enterprises
	6	+ end
	7	+
4	8	def register
5	9	unless logged_in?
6	10	redirect_to :controller => 'account'
...	...
...	...	@@ -0,0 +1,4 @@
	1	+class Affiliation < ActiveRecord::Base
	2	+ belongs_to :user
	3	+ belongs_to :enterprise
	4	+end
...	...
...	...	@@ -11,6 +11,7 @@ class CreateEnterprises < ActiveRecord::Migration
11	11	t.column :economic_activity, :string
12	12	t.column :management_information, :string
13	13	t.column :active, :boolean, :default => "false"
	14	+ t.column :manager_id, :integer
14	15	end
15	16	end
16	17
...	...
...	...	@@ -0,0 +1,12 @@
	1	+class CreateAffiliations < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :affiliations do \|t\|
	4	+ t.column :user_id, :integer
	5	+ t.column :enterprise_id, :integer
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ drop_table :affiliations
	11	+ end
	12	+end
...	...
...	...	@@ -0,0 +1,5 @@
	1	+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
	2	+one:
	3	+ id: 1
	4	+two:
	5	+ id: 2
...	...
...	...	@@ -0,0 +1,10 @@
	1	+require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+class AffiliationTest < Test::Unit::TestCase
	4	+ fixtures :affiliations
	5	+
	6	+ # Replace this with your real tests.
	7	+ def test_truth
	8	+ assert true
	9	+ end
	10	+end
...	...