caboose-cms 0.4.113 → 0.4.114

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTUyMWFmMjc2ZDkyODAxMWVjNTg4ODAzOTQyZTkyMGY2YmQzM2MwNg==
+    ZjNmNDgyNjU5YjI0ODRkOTdhZTQwZDRiZDUyMDEzMjUyODlhYjIxMA==
   data.tar.gz: !binary |-
-    OTkyMTliNGQ5NGM4MzJjMGY2ODZiMmExYTA3NTg2NGU2YmZlMTFiOQ==
+    YzhmMDRlNzliMzM3M2JlNjg5MjZkNjRiOTA1OGRhMDNmNWUxMzM3ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmExZGQ1ZGYwMDA5OGRhMzk0N2M4MzI2YWZlYThlM2Y2ZDI0OWI2ZDNhM2M4
-    MDgxZWM2N2NhMjFkOWQ0YzkyMjE3NWRkYTQ2NTYxYmJlYzE1YmMzOGUzOGMx
-    OTlhYjZlN2MyZDA0ZjJlZDhhMzdhMTkzYmYxNDU1OWIzNDU3MGE=
+    ODg2NjIxZGFjYzdlNDczMDUzNWE0NDFhZDJhYmM5MzI5MWVlNmIwMzhmNmRm
+    MjFlYjc0MmU0NjU4ZTM0NDlkMmEzZTdlMTM3OTdhN2M1OTU0Zjc0ZGRiYjRj
+    ZmQ2MDBiOGM0MWY3NzNlMzFmZmViOTVkZDUyMDFhZGU5MmU0Yjc=
   data.tar.gz: !binary |-
-    MjI3ZmQ1NjRhZTA3ODMyMmNiYmE0ZTEzY2YxMjg3YTMyYWY1NDBkYzliMTFj
-    MDc3ZTgzNzdjMDI0OTVjOGQ0ODIxZmRmYmNjMGVkM2IzYzhkYzRiZWVjYTRm
-    NTgwMDMxNGVmMWIxNDQyZTMyNzMwNjQ2OGMzYjBmMTRhZjM1NDE=
+    NmU5N2Q2ZGNkMjhmNDBiMjc5ZWZmMDJmYjBkMzY5ZmM5YzNmOWU1MTA5MTE0
+    Mjg0OTU5ODlmMjFiOGFkZWU4YjU3MzVlYmQ4ZDRkNDAwMGIyZTA4YjliMDYz
+    Nzg1MWRhMjQzODYxZTA5NDIzZWVlNTZkZjVhMWU3MDBjN2E1Y2Y=

data/app/controllers/caboose/posts_controller.rb

@@ -26,7 +26,8 @@ module Caboose
       return if !user_is_allowed('posts', 'view')
         
       @gen = Caboose::PageBarGenerator.new(params, {
-          'name'       => ''
+          'site_id'     => @site.id,
+          'name'        => ''
       },{
           'model'       => 'Caboose::Post',
           'sort'        => 'created_at DESC',
@@ -55,7 +56,11 @@ module Caboose
     def admin_edit_categories
       return if !user_is_allowed('posts', 'edit')    
       @post = Post.find(params[:id])
-      @categories = PostCategory.reorder(:name).all
+      @categories = PostCategory.where(:site_id => @site.id).reorder(:name).all
+      if @categories.nil? || @categories.count == 0
+        PostCategory.create(:site_id => @site.id, :name => 'General News')
+        @categories = PostCategory.where(:site_id => @site.id).reorder(:name).all
+      end
       render :layout => 'caboose/admin'
     end
   
@@ -114,6 +119,7 @@ module Caboose
       })
     
       post = Post.new
+      post.site_id = @site.id
       post.title = params[:title]      
       post.published = false
   

data/app/models/caboose/post.rb

@@ -4,8 +4,10 @@ class Caboose::Post < ActiveRecord::Base
   
   has_many :post_category_memberships
   has_many :post_categories, :through => :post_category_memberships
-    
-  attr_accessible :id, 
+  belongs_to :site
+  
+  attr_accessible :id,
+    :site_id,
     :category_id, 
     :title, 
     :body, 

data/app/models/caboose/post_category.rb

@@ -5,6 +5,6 @@ class Caboose::PostCategory < ActiveRecord::Base
   has_many :post_category_memberships
   has_many :posts, :through => :post_category_memberships
     
-  attr_accessible :id, :name 
+  attr_accessible :id, :site_id, :name 
 
 end

data/app/models/caboose/schema.rb

@@ -244,17 +244,19 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :action   , :string ]
       ],
       Caboose::Post => [
+        [ :site_id              , :integer    ],
         [ :title                , :text       ],
-        [ :body                 , :text 		   ],
+        [ :body                 , :text 		  ],
         [ :hide                 , :boolean    ],
-        [ :image_url            , :text 		   ],
+        [ :image_url            , :text 		  ],
         [ :published            , :boolean    ],
         [ :created_at           , :datetime   ],
         [ :updated_at           , :datetime   ],
         [ :image                , :attachment ]
       ],
       Caboose::PostCategory => [
-        [ :name , :string ]
+        [ :site_id  , :integer ],
+        [ :name     , :string  ]
       ],
       Caboose::PostCategoryMembership => [
         [ :post_id          , :integer ],

data/app/models/caboose/site.rb

@@ -4,6 +4,7 @@ class Caboose::Site < ActiveRecord::Base
        
   has_many :site_memberships, :class_name => 'Caboose::SiteMembership', :dependent => :delete_all
   has_many :domains, :class_name => 'Caboose::Domain', :dependent => :delete_all
+  has_many :post_categories, :class_name => 'Caboose::PostCategory'
   attr_accessible :id, :name, :description
   
   def smtp_config

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.113'
+  VERSION = '0.4.114'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.113
+  version: 0.4.114
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails