trusty-cms 7.0.5 → 7.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 118f5129fca9aec0c4c3063f03eccb3f44f1b74f2e336dd556e52c52568539e8
4
- data.tar.gz: 3549cdbfa74a9d8f565045ba2678e4d48dda93d8e02b9103278c8a13f477c6da
3
+ metadata.gz: 1200948dac13c1012f25a55e977598239c22b70b3391008962b378c235fa6cb7
4
+ data.tar.gz: 6bdd05cafa5ff067e6a409bece0b952eed391e767260a0e069fbda25f46f68af
5
5
  SHA512:
6
- metadata.gz: 1c63e625bfdf974dc94012ff30ca27f8f0b8418eeb40783174dbe1c1cf70d799806efe73494df4d11dbc79b4be55722948f8828972e2775713cc77672b438bc9
7
- data.tar.gz: 79df9dfb11a86a933d838584de2bd6fc0ee9677033002cf1a9e70107fba86cfe68d52d4cb6f7abcb8aa8c89458e2f098e2e3ffe62097bae1eb4dd310e3b4ae2d
6
+ metadata.gz: 92bba35d94a6c81c165d6e3aac5d54f3de2f5b51025a0c09d6187ab32aa14703c0bb8e6b9fe5a1f7d1a419fa540ce6d6db4bd06e6c3ef64be09c622b52f34184
7
+ data.tar.gz: 8b574e8d01b855debfb6b91859f589d79d111bcb9fe3b80eceb77d26a2ac65852cd3ab3693f727aa8a793a1f9a56ac05bb541af40f2cdae769583c07c1ba73e9
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (7.0.5)
4
+ trusty-cms (7.0.6)
5
5
  RedCloth (= 4.3.3)
6
6
  activestorage-validator
7
7
  acts_as_list (>= 0.9.5, < 1.3.0)
@@ -36,9 +36,8 @@ $(document).ready(function() {
36
36
  return true;
37
37
  }
38
38
 
39
- function validateDateTime() {
39
+ function validateDateTime(status) {
40
40
  const publishedAt = $('#page_published_at').val();
41
- const status = $('#page_status_id').val();
42
41
  const publishedTime = new Date(publishedAt);
43
42
  const currentTime = new Date();
44
43
 
@@ -49,10 +48,14 @@ $(document).ready(function() {
49
48
  if (status === '100') {
50
49
  return validatePublishedStatus(publishedTime, currentTime);
51
50
  }
51
+
52
+ return true;
52
53
  }
53
54
 
54
55
  $('#save-button, #save-and-continue-button').on('click', function(event) {
55
- if (!validateDateTime()) {
56
+ const status = $('#page_status_id').val();
57
+
58
+ if (status && !validateDateTime(status)) {
56
59
  event.preventDefault();
57
60
  event.stopImmediatePropagation();
58
61
  }
@@ -1,5 +1,3 @@
1
- = javascript_include_tag 'admin/validations/scheduled_status_validation'
2
-
3
1
  = fields.hidden_field :lock_version
4
2
  = fields.hidden_field :parent_id
5
3
  = fields.hidden_field :class_name
@@ -73,10 +71,6 @@
73
71
  #preview_panel.fullcover.grey_out{:style => 'display: none;'}
74
72
  %iframe{:id => 'page-preview', :class => 'fullcover', :name => 'page-preview', :src => ActionController::Base.relative_url_root.to_s + '/loading-iframe.html', :frameborder => 0, :scrolling => 'auto'}
75
73
  .preview_tools
76
- =submit_tag(t('buttons.save_changes'), :class => 'big save_changes')
77
- =submit_tag(t('buttons.save_and_continue'), :class => 'big save_and_continue', :name => 'continue')
78
- %span.info
79
- = t('or')
80
- =link_to(t('edit_page'),{}, :class => 'cancel')
74
+ =link_to(t('edit_page'), {}, :class => 'button cancel')
81
75
  - form_bottom.edit_timestamp do
82
76
  = updated_stamp @page
@@ -1,4 +1,4 @@
1
1
  module TrustyCms
2
- VERSION = '7.0.5'.freeze
2
+ VERSION = '7.0.6'.freeze
3
3
  end
4
4
 
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: 7.0.5
4
+ version: 7.0.6
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: 2025-01-06 00:00:00.000000000 Z
11
+ date: 2025-01-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activestorage-validator