more forum stuff

4 files changed, 11 insertions, 9 deletions

diff --git a/db/migrate/00000000000005_create_forumgroups.rb b/db/migrate/00000000000005_create_forumgroups.rb
index 942ad26..4c06033 100644
--- a/db/migrate/00000000000005_create_forumgroups.rb
+++ b/db/migrate/00000000000005_create_forumgroups.rb
@@ -3,8 +3,9 @@ class CreateForumgroups < ActiveRecord::Migration
     create_table :forumgroups do |t|
       t.string :name
       t.integer :position
-      t.integer :read_permission
-      t.integer :write_permission
+
+      t.references :role_read
+      t.references :role_write
     end
   end
 end
\ No newline at end of file
diff --git a/db/migrate/00000000000006_create_forums.rb b/db/migrate/00000000000006_create_forums.rb
index 77b5439..61a7141 100644
--- a/db/migrate/00000000000006_create_forums.rb
+++ b/db/migrate/00000000000006_create_forums.rb
@@ -3,8 +3,9 @@ class CreateForums < ActiveRecord::Migration
     create_table :forums do |t|
       t.string :name
       t.integer :position
-      t.integer :read_permission
-      t.integer :write_permission
+
+      t.references :role_read
+      t.references :role_write
 
       t.references :forumgroup
     end
diff --git a/db/migrate/20130922181339_add_sessions_table.rb b/db/migrate/00000000000008_add_sessions_table.rb
index 4c87956..4c87956 100644
--- a/db/migrate/20130922181339_add_sessions_table.rb
+++ b/db/migrate/00000000000008_add_sessions_table.rb
diff --git a/db/schema.rb b/db/schema.rb
index bdcd2e5..add6f97 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130922181339) do
+ActiveRecord::Schema.define(:version => 8) do
 
   create_table "blogposts", :force => true do |t|
     t.string   "title"
@@ -34,15 +34,15 @@ ActiveRecord::Schema.define(:version => 20130922181339) do
   create_table "forumgroups", :force => true do |t|
     t.string  "name"
     t.integer "position"
-    t.integer "read_permission"
-    t.integer "write_permission"
+    t.integer "role_read_id"
+    t.integer "role_write_id"
   end
 
   create_table "forums", :force => true do |t|
     t.string  "name"
     t.integer "position"
-    t.integer "read_permission"
-    t.integer "write_permission"
+    t.integer "role_read_id"
+    t.integer "role_write_id"
     t.integer "forumgroup_id"
   end