workarea-admin 3.4.22 → 3.4.23
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/view_models/workarea/admin/dashboards/marketing_view_model.rb +9 -5
- data/app/views/workarea/admin/create_releases/setup.html.haml +2 -2
- data/app/views/workarea/admin/releases/_publish.html.haml +1 -1
- data/app/views/workarea/admin/releases/edit.html.haml +2 -2
- data/test/dummy/tmp/screenshots/.keep +0 -0
- metadata +7 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: bd17768d4451b3cc933fe8fd4ff639ddf97f7072c7ac87adfe3d71fa0af83565
|
4
|
+
data.tar.gz: ded4bc099f84dceae85c21afbd0f42ab2342eaf6b8966336efbc7dee5f8e80e2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 837d4c84995d8ed90b1b819f7560042368e28f72c0107c1d69582782fb68361fe19a14186c8ca432150c2b49d039163849c83d8468923cd178ce9a34259caaff
|
7
|
+
data.tar.gz: fac2899bc0d8318ecade76a0a0d8d8e4624834a4250a1d39cd5dbf4ab41a7fb615991a51370d72404356a7887045a2638d08768c0fe3b305c958d0d4aec5fed5
|
@@ -37,17 +37,17 @@ module Workarea
|
|
37
37
|
{
|
38
38
|
'$match' => {
|
39
39
|
'created_at' => {
|
40
|
-
'$gte' => starts_at.beginning_of_day,
|
41
|
-
'$lte' => ends_at.end_of_day
|
40
|
+
'$gte' => starts_at.beginning_of_day.utc,
|
41
|
+
'$lte' => ends_at.end_of_day.utc
|
42
42
|
}
|
43
43
|
}
|
44
44
|
},
|
45
45
|
{
|
46
46
|
'$group' => {
|
47
47
|
'_id' => {
|
48
|
-
'day' => { '$dayOfMonth' =>
|
49
|
-
'month' => { '$month' =>
|
50
|
-
'year' => { '$year' =>
|
48
|
+
'day' => { '$dayOfMonth' => created_at_in_time_zone },
|
49
|
+
'month' => { '$month' => created_at_in_time_zone },
|
50
|
+
'year' => { '$year' => created_at_in_time_zone }
|
51
51
|
},
|
52
52
|
'created_at' => { '$first' => '$created_at' },
|
53
53
|
'count' => { '$sum' => 1 }
|
@@ -61,6 +61,10 @@ module Workarea
|
|
61
61
|
end
|
62
62
|
end
|
63
63
|
|
64
|
+
def created_at_in_time_zone
|
65
|
+
{ 'date' => '$created_at', 'timezone' => Time.zone.tzinfo.name }
|
66
|
+
end
|
67
|
+
|
64
68
|
def insights
|
65
69
|
@insights ||= InsightViewModel.wrap(
|
66
70
|
Workarea::Insights::Base.by_dashboard('marketing').page(options[:page])
|
@@ -22,12 +22,12 @@
|
|
22
22
|
.grid__cell.grid__cell--50-at-medium
|
23
23
|
.property
|
24
24
|
= label_tag 'release_publish_at', t('workarea.admin.fields.publish_at'), class: 'property__name'
|
25
|
-
.box.box--rounded= hidden_field_tag 'release[publish_at]', @release.publish_at, data: { datetimepicker_field: { inline: true } }
|
25
|
+
.box.box--rounded= hidden_field_tag 'release[publish_at]', @release.publish_at, data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } }.to_json }
|
26
26
|
|
27
27
|
.grid__cell.grid__cell--50-at-medium
|
28
28
|
.property
|
29
29
|
= label_tag 'release_undo_at', t('workarea.admin.fields.undo_at'), class: 'property__name'
|
30
|
-
.box.box--rounded= hidden_field_tag 'release[undo_at]', nil, data: { datetimepicker_field: { inline: true } }
|
30
|
+
.box.box--rounded= hidden_field_tag 'release[undo_at]', nil, data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } }.to_json }
|
31
31
|
|
32
32
|
.property
|
33
33
|
= label_tag 'release[tag_list]', t('workarea.admin.fields.tags'), class: 'property__name'
|
@@ -28,4 +28,4 @@
|
|
28
28
|
- if current_user.can_publish_now?
|
29
29
|
.property
|
30
30
|
= label_tag 'release[publish_at]', t('workarea.admin.releases.publish.when_does_it_publish'), class: 'property__name'
|
31
|
-
= hidden_field_tag 'release[publish_at]', nil, placeholder: t('workarea.admin.releases.publish.when_does_it_publish'), data: { datetimepicker_field: { inline: true } }
|
31
|
+
= hidden_field_tag 'release[publish_at]', nil, placeholder: t('workarea.admin.releases.publish.when_does_it_publish'), data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } }.to_json }
|
@@ -31,7 +31,7 @@
|
|
31
31
|
= label_tag 'release_publish_at', t('workarea.admin.fields.publish_at'), class: 'property__name'
|
32
32
|
|
33
33
|
- if current_user.can_publish_now?
|
34
|
-
.box.box--rounded= hidden_field_tag 'release[publish_at]', @release.publish_at, data: { datetimepicker_field: { inline: true } }
|
34
|
+
.box.box--rounded= hidden_field_tag 'release[publish_at]', @release.publish_at, data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } }.to_json }
|
35
35
|
- elsif @release.publish_at.present?
|
36
36
|
= local_time(@release.publish_at)
|
37
37
|
- else
|
@@ -49,7 +49,7 @@
|
|
49
49
|
= label_tag 'release_undo_at', t('workarea.admin.fields.undo_at'), class: 'property__name'
|
50
50
|
|
51
51
|
- if current_user.can_publish_now?
|
52
|
-
.box.box--rounded= hidden_field_tag 'release[undo_at]', @release.undo_at, data: { datetimepicker_field: { inline: true } }
|
52
|
+
.box.box--rounded= hidden_field_tag 'release[undo_at]', @release.undo_at, data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } }.to_json }
|
53
53
|
- elsif @release.undo_at.present?
|
54
54
|
= local_time(@release.undo_at)
|
55
55
|
- else
|
File without changes
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: workarea-admin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.4.
|
4
|
+
version: 3.4.23
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ben Crouse
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2019-
|
11
|
+
date: 2019-12-18 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: workarea-core
|
@@ -16,28 +16,28 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3.4.
|
19
|
+
version: 3.4.23
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 3.4.
|
26
|
+
version: 3.4.23
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: workarea-storefront
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 3.4.
|
33
|
+
version: 3.4.23
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - '='
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 3.4.
|
40
|
+
version: 3.4.23
|
41
41
|
description: Provides site administration functionality for the Workarea Commerce
|
42
42
|
Platform.
|
43
43
|
email:
|
@@ -1180,6 +1180,7 @@ files:
|
|
1180
1180
|
- test/dummy/public/500.html
|
1181
1181
|
- test/dummy/public/favicon.ico
|
1182
1182
|
- test/dummy/script/rails
|
1183
|
+
- test/dummy/tmp/screenshots/.keep
|
1183
1184
|
- test/helpers/workarea/admin/application_helper_test.rb
|
1184
1185
|
- test/helpers/workarea/admin/icons_helper_test.rb
|
1185
1186
|
- test/helpers/workarea/admin/imports_helper_test.rb
|