trusty-cms 3.1.10 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1b4c73711f7c592579a1564ca3191d6e528d332
-  data.tar.gz: c21141b06db1db5e76767dca9dd3d2c1b063021b
+  metadata.gz: a3260a9da5f00e7da4f5c2efab2fdf782490f5c0
+  data.tar.gz: 259eaf17d2f4dbabc127ef1940ec04c57d5588be
 SHA512:
-  metadata.gz: 775d838815bf49148043a016da84381e5769c0db320105e95382f7a1b00d1b045d70c4f322d4e1b006adecca539dfeb98955ab70def68a2bc4e27fdc709841ec
-  data.tar.gz: db51f3e79eb9cdcd7f7724009d1f25579ef61e97479803c6e14493adbad3e6ea44e3814701fb1fe84c871b40bbd58f4f3d0588627e2ba63cc8bdc002cac18e04
+  metadata.gz: c8a332f33aa2c30556cabd2c696151c560a14efc8f2929dd0b0fdae5e77ee81cc068b99fe3ee1b2a89c4029b034bb8154a35f330b15d2bef59177c394db4bc26
+  data.tar.gz: c1ee6c5e3077728602f86850b1e502be35efab85f3cc393b6b6666af5b652632a4325cb0e6e6a92dc1b1a7a87b7b2f031df3a6cafa2f8ebc44cba8d0a81d54ae

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    trusty-cms (3.1.10)
+    trusty-cms (3.1.11)
       RedCloth (~> 4.3.2)
       acts_as_tree (~> 2.6.1)
       bundler (~> 1.7)
@@ -38,39 +38,39 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (5.1.4)
-      actionpack (= 5.1.4)
+    actioncable (5.1.5)
+      actionpack (= 5.1.5)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
+    actionmailer (5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.4)
-      actionview (= 5.1.4)
-      activesupport (= 5.1.4)
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.4)
-      activesupport (= 5.1.4)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.4)
-      activesupport (= 5.1.4)
+    activejob (5.1.5)
+      activesupport (= 5.1.5)
       globalid (>= 0.3.6)
-    activemodel (5.1.4)
-      activesupport (= 5.1.4)
-    activerecord (5.1.4)
-      activemodel (= 5.1.4)
-      activesupport (= 5.1.4)
+    activemodel (5.1.5)
+      activesupport (= 5.1.5)
+    activerecord (5.1.5)
+      activemodel (= 5.1.5)
+      activesupport (= 5.1.5)
       arel (~> 8.0)
-    activesupport (5.1.4)
+    activesupport (5.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -83,7 +83,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     arel (8.0.0)
     builder (3.2.3)
-    byebug (9.1.0)
+    byebug (10.0.0)
     capybara (2.13.0)
       addressable
       mime-types (>= 1.16)
@@ -135,7 +135,7 @@ GEM
     factory_girl_rails (4.6.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    ffi (1.9.21)
+    ffi (1.9.23)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     haml (5.0.4)
@@ -153,13 +153,13 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (0.9.3)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.19)
-    loofah (2.1.1)
+    loofah (2.2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
@@ -185,44 +185,44 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.5.1)
-      byebug (~> 9.1)
+    pry-byebug (3.6.0)
+      byebug (~> 10.0)
       pry (~> 0.10)
     pry-rails (0.3.6)
       pry (>= 0.10.4)
-    public_suffix (3.0.1)
+    public_suffix (3.0.2)
     puma (3.11.2)
     rack (2.0.4)
     rack-cache (1.7.1)
       rack (>= 0.4)
-    rack-test (0.8.2)
+    rack-test (0.8.3)
       rack (>= 1.0, < 3)
     radius (0.7.4)
-    rails (5.1.4)
-      actioncable (= 5.1.4)
-      actionmailer (= 5.1.4)
-      actionpack (= 5.1.4)
-      actionview (= 5.1.4)
-      activejob (= 5.1.4)
-      activemodel (= 5.1.4)
-      activerecord (= 5.1.4)
-      activesupport (= 5.1.4)
+    rails (5.1.5)
+      actioncable (= 5.1.5)
+      actionmailer (= 5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
+      activemodel (= 5.1.5)
+      activerecord (= 5.1.5)
+      activesupport (= 5.1.5)
       bundler (>= 1.3.0)
-      railties (= 5.1.4)
+      railties (= 5.1.5)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.1.4)
-      actionpack (= 5.1.4)
-      activesupport (= 5.1.4)
+    railties (5.1.5)
+      actionpack (= 5.1.5)
+      activesupport (= 5.1.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
-    rb-fsevent (0.10.2)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rdoc (5.1.0)
@@ -250,7 +250,7 @@ GEM
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    ruby_parser (3.10.1)
+    ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
     sass (3.4.25)
     sass-rails (5.0.7)
@@ -259,7 +259,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.10.0)
+    sexp_processor (4.10.1)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -285,7 +285,7 @@ GEM
     tilt (2.0.8)
     trustygems (0.2.1)
       rake
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
@@ -320,4 +320,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/app/controllers/admin/page_fields_controller.rb

@@ -1,6 +1,6 @@
 class Admin::PageFieldsController < Admin::ResourceController
   def create
-    self.model = PageField.new(page_fields_params)
+    self.model.attributes = page_fields_params
     @controller_name = 'page'
     @template_name = 'edit'
     render :partial => "page_field", :object => model,

data/app/views/admin/layouts/_site_chooser.html.haml

@@ -1,5 +1,3 @@
-= stylesheet_link_tag 'admin/multi_site'
-
 - if admin? && defined?(Site) && defined?(controller) && controller.sited_model? && controller.template_name == 'index' && Site.several?
   %nav#site_chooser
     %ul#nav

data/app/views/admin/sites/edit.haml

@@ -1,4 +1,3 @@
-= stylesheet_link_tag 'admin/multi_site'
 - render_region :main do |main|
   - main.edit_header do
     %h1 Edit Site

data/app/views/admin/sites/index.haml

@@ -1,5 +1,4 @@
-= stylesheet_link_tag 'admin/multi_site'
-= render_region :top 
+= render_region :top
 
 %h1 Sites
 

data/app/views/admin/sites/new.haml

@@ -1,4 +1,3 @@
-= stylesheet_link_tag 'admin/multi_site'
 - render_region :main do |main|
   - main.edit_header do
     %h1 New Site

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '3.1.10'
+    VERSION = '3.1.11'
   end
 end

data/vendor/extensions/multi-site-extension/lib/multi_site/engine.rb

@@ -2,9 +2,5 @@ module MultiSite
   class Engine < Rails::Engine
     paths["app/helpers"] = []
 
-    initializer "multi_site.assets.precompile" do |app|
-      app.config.assets.precompile += %w(admin/multi_site.css)
-    end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.1.11
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo