trusty-cms 7.0.4 → 7.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05933f41895532d7fe76ff1dfef0d58a2ca32616cc65d1371de837b8205fb038'
-  data.tar.gz: b0fb2ed52eba017ff08af74846e4e299fd21307f740954004002097a9279dbfd
+  metadata.gz: 1200948dac13c1012f25a55e977598239c22b70b3391008962b378c235fa6cb7
+  data.tar.gz: 6bdd05cafa5ff067e6a409bece0b952eed391e767260a0e069fbda25f46f68af
 SHA512:
-  metadata.gz: 863fe6620bddab68ac18164ba50a1b60e785f00efdfd8a16f907045d2f5fe5fa372b30352c3a7ea4e13bf89200823f3fc181ee4937a49e7f9d3d70bcf9338740
-  data.tar.gz: 16f1007d43c8ab0f8c52f36d1d90dae8d9652caaa0ad1f7e55b7a6d6699b1cdff6ab1e6f5ec059270e434bdb9d119449351f608dbd3a115c49b0c3d786a1f7f1
+  metadata.gz: 92bba35d94a6c81c165d6e3aac5d54f3de2f5b51025a0c09d6187ab32aa14703c0bb8e6b9fe5a1f7d1a419fa540ce6d6db4bd06e6c3ef64be09c622b52f34184
+  data.tar.gz: 8b574e8d01b855debfb6b91859f589d79d111bcb9fe3b80eceb77d26a2ac65852cd3ab3693f727aa8a793a1f9a56ac05bb541af40f2cdae769583c07c1ba73e9

data/Gemfile

@@ -21,7 +21,7 @@ group :development, :test do
   gem 'mysql2'
   gem 'poltergeist', '~> 1.18.1'
   gem 'pry-byebug'
-  gem 'psych', '5.2.0'
+  gem 'psych', '5.2.2'
   gem 'rails-observers'
   gem 'ransack'
   gem 'rspec-rails'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.3)
+    trusty-cms (7.0.6)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -115,7 +115,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     base64 (0.2.0)
     bcrypt (3.1.20)
-    bigdecimal (3.1.8)
+    bigdecimal (3.1.9)
     builder (3.3.0)
     byebug (11.1.3)
     capybara (3.40.0)
@@ -266,7 +266,8 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    psych (5.2.0)
+    psych (5.2.2)
+      date
       stringio
     public_suffix (6.0.1)
     racc (1.8.1)
@@ -275,7 +276,7 @@ GEM
       rack (>= 0.4)
     rack-test (2.1.0)
       rack (>= 1.3)
-    radius (0.7.5)
+    radius (0.8.0)
     rails (7.0.8.7)
       actioncable (= 7.0.8.7)
       actionmailbox (= 7.0.8.7)
@@ -311,7 +312,7 @@ GEM
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
-    rdoc (6.8.1)
+    rdoc (6.10.0)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
     reline (0.5.11)
@@ -414,7 +415,7 @@ DEPENDENCIES
   mysql2
   poltergeist (~> 1.18.1)
   pry-byebug
-  psych (= 5.2.0)
+  psych (= 5.2.2)
   rails-observers
   ransack
   rspec-rails

data/app/assets/config/trusty-cms-manifest.js

@@ -4,3 +4,4 @@
 //= link admin/assets.css
 //= link admin/assets_admin.js
 //= link admin/custom_file_upload.js
+//= link admin/validations/scheduled_status_validation.js

data/app/assets/javascripts/admin/validations/scheduled_status_validation.js

@@ -36,9 +36,8 @@ $(document).ready(function() {
     return true;
   }
 
-  function validateDateTime() {
+  function validateDateTime(status) {
     const publishedAt = $('#page_published_at').val();
-    const status = $('#page_status_id').val();
     const publishedTime = new Date(publishedAt);
     const currentTime = new Date();
 
@@ -49,10 +48,14 @@ $(document).ready(function() {
     if (status === '100') {
       return validatePublishedStatus(publishedTime, currentTime);
     }
+
+    return true;
   }
 
   $('#save-button, #save-and-continue-button').on('click', function(event) {
-    if (!validateDateTime()) {
+    const status = $('#page_status_id').val();
+
+    if (status && !validateDateTime(status)) {
       event.preventDefault();
       event.stopImmediatePropagation();
     }

data/app/views/admin/pages/_fields.html.haml

@@ -1,5 +1,3 @@
-= javascript_include_tag 'admin/validations/scheduled_status_validation'
-
 = fields.hidden_field :lock_version
 = fields.hidden_field :parent_id
 = fields.hidden_field :class_name
@@ -73,10 +71,6 @@
     #preview_panel.fullcover.grey_out{:style => 'display: none;'}
       %iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src =>  ActionController::Base.relative_url_root.to_s + '/loading-iframe.html', :frameborder => 0, :scrolling => 'auto'}
       .preview_tools
-        =submit_tag(t('buttons.save_changes'), :class => 'big save_changes')
-        =submit_tag(t('buttons.save_and_continue'), :class => 'big save_and_continue', :name => 'continue')
-        %span.info
-          = t('or')
-          =link_to(t('edit_page'),{}, :class => 'cancel')
+        =link_to(t('edit_page'), {}, :class => 'button cancel')
   - form_bottom.edit_timestamp do
     = updated_stamp @page

data/lib/trusty_cms/version.rb

@@ -1,4 +1,4 @@
 module TrustyCms
-  VERSION = '7.0.4'.freeze
+  VERSION = '7.0.6'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.4
+  version: 7.0.6
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-02 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator