trusty-cms 3.3.3 → 3.3.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA256:
3
- metadata.gz: 4ec33c7376f2114c2019e102b4931f82c0ce94b1257c3f20c4d4ed99a3fd1e6c
4
- data.tar.gz: b83b1835c8557c8cf863c1db8587fcd255e8ba6e6a4d011fe3cf6b68533e5042
2
+ SHA1:
3
+ metadata.gz: 16eea229bc772e862ce66db40422d745e602c8b3
4
+ data.tar.gz: eed6ea9e7a1e5825584f975f7f412c2ae94c47d5
5
5
  SHA512:
6
- metadata.gz: e3d5e48bd8a20914b861e56c75e16f756ed8c31d6b6f4a97b19c80533e01e3e4d5db7ae6e631d09ab860a1f0c3af589ac938ded6ef288445d426a3aaae89000a
7
- data.tar.gz: 1ae1bda8cfc08013eb5c258059ad62be1701bd4fea1fbab1465d85850207c2041c058fea8deca1ae11d6beb878b47659342a43514c0033cfe867591c81aff28b
6
+ metadata.gz: 58aebe76ce374edcc476a9c2d838879c64c31b4a6123f2cbc73108df72ff8e85f0f616131cc2771255dddffea08239c999d23f2970105451a0cd47b707490205
7
+ data.tar.gz: adc1ab8597c6a7aa5cb771aa37e388b0feff41c7fd017a23c149cc6c39b551147410b89d3f87ce39495d5a627b483b4e5e1272bb46b2745527c075f8bdc8b7b5
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (3.3.3)
4
+ trusty-cms (3.3.5)
5
5
  RedCloth (= 4.3.2)
6
6
  acts_as_list (~> 0.9.5)
7
7
  acts_as_tree (~> 2.6.1)
@@ -185,7 +185,7 @@ GEM
185
185
  multi_xml (0.6.0)
186
186
  multipart-post (2.0.0)
187
187
  mysql2 (0.5.1)
188
- nio4r (2.3.0)
188
+ nio4r (2.3.1)
189
189
  nokogiri (1.8.2)
190
190
  mini_portile2 (~> 2.3.0)
191
191
  orm_adapter (0.5.0)
@@ -207,7 +207,7 @@ GEM
207
207
  pry (~> 0.10)
208
208
  public_suffix (3.0.2)
209
209
  rack (2.0.5)
210
- rack-cache (1.7.1)
210
+ rack-cache (1.7.2)
211
211
  rack (>= 0.4)
212
212
  rack-test (1.0.0)
213
213
  rack (>= 1.0, < 3)
data/INSTALL.md CHANGED
@@ -12,5 +12,7 @@ From within the directory containing your TrustyCMS instance:
12
12
 
13
13
  4. Run the Trusty CMS generator to get the project into shape: `rails g trusty_cms [project_name]`.
14
14
  - This will ask you if you want to replace a number of existing files (like application.rb); reply Y to all.
15
+
16
+ 5. add config.extensions = [ :snippets, :clipped, :layouts, :multi_site ] to enable them in application.rb
15
17
 
16
- 5. Run `bundle exec rake db:setup`, then `bundle exec rake db:bootstrap`.
18
+ 6. Run `bundle exec rake db:setup`, then `bundle exec rake db:bootstrap`.
data/app/models/asset.rb CHANGED
@@ -10,8 +10,6 @@ class Asset < ActiveRecord::Base
10
10
 
11
11
  default_scope {order("created_at DESC")}
12
12
 
13
- attr_accessor :title, :asset, :caption
14
-
15
13
  scope :latest, lambda { |limit|
16
14
  order("created_at DESC").limit(limit)
17
15
  }
@@ -1200,7 +1200,7 @@ module StandardTags
1200
1200
  paging = pagination_find_options(tag)
1201
1201
  result = []
1202
1202
  tag.locals.previous_headers = {}
1203
- displayed_children = paging ? findable.paginate(options.merge(paging)) : findable.all(options)
1203
+ displayed_children = paging ? findable.paginate(options.merge(paging)) : findable.all.where(options[:conditions]).order(options[:order])
1204
1204
  displayed_children.each_with_index do |item, i|
1205
1205
  tag.locals.child = item
1206
1206
  tag.locals.page = item
data/lib/trusty_cms.rb CHANGED
@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
2
2
 
3
3
  unless defined? TrustyCms::VERSION
4
4
  module TrustyCms
5
- VERSION = '3.3.3'
5
+ VERSION = '3.3.5'
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.3
4
+ version: 3.3.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-04-30 00:00:00.000000000 Z
11
+ date: 2018-05-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: acts_as_list
@@ -1300,7 +1300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1300
1300
  version: 1.3.1
1301
1301
  requirements: []
1302
1302
  rubyforge_project:
1303
- rubygems_version: 2.7.6
1303
+ rubygems_version: 2.6.13
1304
1304
  signing_key:
1305
1305
  specification_version: 4
1306
1306
  summary: A no-fluff content management system designed for small teams.