trusty-cms 3.3.6 → 3.3.7

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
2
  SHA1:
3
- metadata.gz: aa108eeb06b70493807dad5a32294529021e7eef
4
- data.tar.gz: 7d925ee1fb71a2cc141e2b7f3a7d3b9712233f5b
3
+ metadata.gz: 38e20f8b5ec8febefecf35608a5bb563a5f8cdc3
4
+ data.tar.gz: 5188b2500da601c02693f8842f9e0194061bae86
5
5
  SHA512:
6
- metadata.gz: 84cca2ae046b73a26a5eb85ad256400fc1778c9a60eeeaca96a35c7a1969a48c39b6936e434714a15c5bb2ade9841d339dacbb6365b1dc541404ea2482abb874
7
- data.tar.gz: 063a6ac7e32068bce5786166ea6ec2df3443e94a4c3b65fb20fb845f29f7b752769cc814702689702e49a97c6d0635854ad7e5719fc5f7f30d600d210c37b861
6
+ metadata.gz: f908e3f021225fbc111d5f5e0ee5e7647c7398199911df171d64393d6a585b3e2cf291995dffd7b5c17cfd9b1657449f215960653475a415261ab33071716e42
7
+ data.tar.gz: 002de722b26537ff70e01deddd9f8034cd82a7c094dc587ac03539e72a27085e8e48992dfaaafed3ccc54fd00f9fe69ef7cf661483df9050773c8faf6aeaac37
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (3.3.6)
4
+ trusty-cms (3.3.7)
5
5
  RedCloth (= 4.3.2)
6
6
  acts_as_list (~> 0.9.5)
7
7
  acts_as_tree (~> 2.6.1)
@@ -75,7 +75,7 @@ GEM
75
75
  i18n (>= 0.7, < 2)
76
76
  minitest (~> 5.1)
77
77
  tzinfo (~> 1.1)
78
- acts_as_list (0.9.14)
78
+ acts_as_list (0.9.15)
79
79
  activerecord (>= 3.0)
80
80
  acts_as_tree (2.6.1)
81
81
  activerecord (>= 3.0.0)
@@ -186,7 +186,7 @@ GEM
186
186
  multipart-post (2.0.0)
187
187
  mysql2 (0.5.1)
188
188
  nio4r (2.3.1)
189
- nokogiri (1.8.2)
189
+ nokogiri (1.8.3)
190
190
  mini_portile2 (~> 2.3.0)
191
191
  orm_adapter (0.5.0)
192
192
  paperclip (6.0.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.2)
210
+ rack-cache (1.8.0)
211
211
  rack (>= 0.4)
212
212
  rack-test (1.0.0)
213
213
  rack (>= 1.0, < 3)
@@ -282,7 +282,7 @@ GEM
282
282
  json (>= 1.8, < 3)
283
283
  simplecov-html (~> 0.10.0)
284
284
  simplecov-html (0.10.2)
285
- sprockets (3.7.1)
285
+ sprockets (3.7.2)
286
286
  concurrent-ruby (~> 1.0)
287
287
  rack (> 1, < 3)
288
288
  sprockets-rails (3.2.1)
data/app/models/page.rb CHANGED
@@ -8,7 +8,7 @@ class Page < ActiveRecord::Base
8
8
  before_save :update_virtual, :update_status, :set_allowed_children_cache
9
9
 
10
10
  # Associations
11
- acts_as_tree :order => 'title ASC'
11
+ acts_as_tree :order => 'position ASC'
12
12
  has_many :parts, -> {order(:id)}, :class_name => 'PagePart', :dependent => :destroy
13
13
  accepts_nested_attributes_for :parts, :allow_destroy => true
14
14
  has_many :fields, -> {order(:id)}, :class_name => 'PageField', :dependent => :destroy
@@ -29,8 +29,6 @@ class Page < ActiveRecord::Base
29
29
 
30
30
  validate :valid_class_name
31
31
 
32
- default_scope { order('position ASC') }
33
-
34
32
  include TrustyCms::Taggable
35
33
  include StandardTags
36
34
  include DeprecatedTags
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.6'
5
+ VERSION = '3.3.7'
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.6
4
+ version: 3.3.7
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-06-06 00:00:00.000000000 Z
11
+ date: 2018-06-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: acts_as_list