trusty-cms 7.0.5 → 7.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 118f5129fca9aec0c4c3063f03eccb3f44f1b74f2e336dd556e52c52568539e8
-  data.tar.gz: 3549cdbfa74a9d8f565045ba2678e4d48dda93d8e02b9103278c8a13f477c6da
+  metadata.gz: 1200948dac13c1012f25a55e977598239c22b70b3391008962b378c235fa6cb7
+  data.tar.gz: 6bdd05cafa5ff067e6a409bece0b952eed391e767260a0e069fbda25f46f68af
 SHA512:
-  metadata.gz: 1c63e625bfdf974dc94012ff30ca27f8f0b8418eeb40783174dbe1c1cf70d799806efe73494df4d11dbc79b4be55722948f8828972e2775713cc77672b438bc9
-  data.tar.gz: 79df9dfb11a86a933d838584de2bd6fc0ee9677033002cf1a9e70107fba86cfe68d52d4cb6f7abcb8aa8c89458e2f098e2e3ffe62097bae1eb4dd310e3b4ae2d
+  metadata.gz: 92bba35d94a6c81c165d6e3aac5d54f3de2f5b51025a0c09d6187ab32aa14703c0bb8e6b9fe5a1f7d1a419fa540ce6d6db4bd06e6c3ef64be09c622b52f34184
+  data.tar.gz: 8b574e8d01b855debfb6b91859f589d79d111bcb9fe3b80eceb77d26a2ac65852cd3ab3693f727aa8a793a1f9a56ac05bb541af40f2cdae769583c07c1ba73e9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.5)
+    trusty-cms (7.0.6)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)

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.5'.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.5
+  version: 7.0.6
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator