pages_cms 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d00afdd36a6bacc3f553190435559b9e6b4f678a
-  data.tar.gz: 7c4532c3a42f2b17c66d2e993cfe96e739fe1499
+  metadata.gz: a1ce4d726b10be579824434e613adf69600e1ea3
+  data.tar.gz: 6c740d37e35ecfbee698b271edca869bc41f6377
 SHA512:
-  metadata.gz: cd451ddbbef465427f5ce64f180e7878339904f49d6e3caf71cba925611d3b80be946e14111cb0a18f191ebcf3785e303b3fece9dee3cce50ce456aaeebc5aa4
-  data.tar.gz: 04844b537828732496e5de8346463a6cdb3150673ae482afc1916db0250e156ce8bc431962725b7c666c019fa212457da0fc325a45a566094329048af11af0bd
+  metadata.gz: 02c3e1733072ae9b4d55a491008ef7a8edcb5375f253bfebdde4a13a0fed094e7c66cb11219115a124a505f2df82298462d9e9aabcf5c8f73bcd7583c4500be6
+  data.tar.gz: 0f807f3ff9950c49826bbc2f942ae273d5af6872b6b0e3ed2c799e645197c88437aa6dddeaee6fd2494aaf458c717da8317882a9d54b4e88376bd24167715eeb

data/app/controllers/pages_cms/pages_controller.rb

@@ -8,11 +8,6 @@ module PagesCms
       page_setup(page)
     end
 
-    def subpage
-      page = Page.find_by_slug(params[:slug])
-      page_setup(page)
-    end
-
     def home
       page = Page.find_by_title('Home')
       page_setup(page)
@@ -22,6 +17,10 @@ module PagesCms
       def page_setup(page)
         if page != nil
           @page = page
+          @articles = Article.published
+          filter_params(params).each do |search, result|
+            @articles = @articles.public_send(search, result) if result.present?
+          end
           if @page.sidebar && @page.sidebar.show && @page.sidebar.use_instead.nil?
             @sidebar = @page.sidebar
           elsif @page.sidebar && !@page.sidebar.show

data/config/routes.rb

@@ -1,6 +1,6 @@
 PagesCms::Engine.routes.draw do
 
-  resources :articles,    only: [:show, :index]
+  resources :articles,    only: [:show]
 
   namespace :admin do
     resources :pages,     except: [:show, :new]

data/db/migrate/20150609171657_create_initial_db.rb

@@ -78,10 +78,13 @@ class CreateInitialDb < ActiveRecord::Migration
       t.integer   :page_id, index: true
       t.integer   :use_instead
       t.text      :content
+      t.boolean   :show,      default: true
+      t.boolean   :fb_feed,   default: false
+      t.boolean   :tw_feed,   default: false
+      t.boolean   :all_tags,  default: false
+      t.boolean   :all_posts, default: false
+      t.boolean   :all_pages, default: false
       t.text      :links
-      t.boolean   :show,    default: true
-      t.boolean   :fb_feed, default: false
-      t.boolean   :tw_feed, default: false
 
       t.timestamps null: false
     end

data/lib/pages_cms/version.rb

@@ -1,3 +1,3 @@
 module PagesCms
-  VERSION = '1.0.6'
+  VERSION = '1.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pages_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Colin Walker
@@ -2211,7 +2211,6 @@ files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/zpbZyJGYRirQezbLSkfqwGXAsP6_X0AgBLqCRObdV5g.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/zvuIk60FLYMxl3JSvcqIBvhiIZoeTGYhWdESo82-lYM.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/zw_V0aFY2ssph1T5gT3I-vKtjFiS9XO9RNjtfmMfQZw.cache
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/pages_cms/articles.yml
 - test/fixtures/pages_cms/blog_feeds.yml
 - test/fixtures/pages_cms/default.png
@@ -4205,7 +4204,6 @@ test_files:
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/zvuIk60FLYMxl3JSvcqIBvhiIZoeTGYhWdESo82-lYM.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/zw_V0aFY2ssph1T5gT3I-vKtjFiS9XO9RNjtfmMfQZw.cache
 - test/dummy/tmp/cache/assets/test/sprockets/v3.0/zY0sdocCDnCgtrDIkVQ42PdK5DnzOw8FKIh57ivx6ss.cache
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/pages_cms/articles.yml
 - test/fixtures/pages_cms/blog_feeds.yml
 - test/fixtures/pages_cms/default.png

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-55810