added related_assets to pages

6 files changed, 39 insertions, 0 deletions

diff --git a/app/models/asset.rb b/app/models/asset.rb
index 6f727ad..fda2dc0 100644
--- a/app/models/asset.rb
+++ b/app/models/asset.rb
@@ -1,5 +1,7 @@
 class Asset < ActiveRecord::Base
   
+  has_many :pages, :through => :related_assets
+  
   has_attached_file(
     :upload,
     :styles => {
diff --git a/app/models/page.rb b/app/models/page.rb
index b6d6489..d697a96 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -30,6 +30,8 @@ class Page < ActiveRecord::Base
   # Associations
   belongs_to :node
   belongs_to :user
+  has_many   :related_assets
+  has_many   :assets, :through => :related_assets, :order => "position DESC"
   
   # Filter
   before_create :set_page_title
diff --git a/app/models/related_asset.rb b/app/models/related_asset.rb
new file mode 100644
index 0000000..dc4dc3d
--- /dev/null
+++ b/app/models/related_asset.rb
@@ -0,0 +1,6 @@
+class RelatedAsset < ActiveRecord::Base
+  belongs_to :page
+  belongs_to :asset
+  
+  acts_as_list, :scope => :page_id
+end
\ No newline at end of file
diff --git a/db/migrate/20090901051946_create_related_assets.rb b/db/migrate/20090901051946_create_related_assets.rb
new file mode 100644
index 0000000..849bf19
--- /dev/null
+++ b/db/migrate/20090901051946_create_related_assets.rb
@@ -0,0 +1,14 @@
+class CreateRelatedAssets < ActiveRecord::Migration
+  def self.up
+    create_table :related_assets do |t|
+      t.integer :asset_id
+      t.integer :page_id
+      t.integer :position,  :default => 1
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :related_assets
+  end
+end
diff --git a/test/fixtures/related_assets.yml b/test/fixtures/related_assets.yml
new file mode 100644
index 0000000..5bf0293
--- /dev/null
+++ b/test/fixtures/related_assets.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+# one:
+#   column: value
+#
+# two:
+#   column: value
diff --git a/test/unit/related_asset_test.rb b/test/unit/related_asset_test.rb
new file mode 100644
index 0000000..a739e6b
--- /dev/null
+++ b/test/unit/related_asset_test.rb
@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class RelatedImageTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end