workarea-admin 3.5.17 → 3.5.18
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 +4 -4
- data/app/assets/javascripts/workarea/admin/modules/remote_selects.js +13 -1
- data/app/assets/stylesheets/workarea/admin/components/_workflow_bar.scss +5 -0
- data/app/controllers/workarea/admin/bulk_variant_saving.rb +2 -1
- data/app/controllers/workarea/admin/configurations_controller.rb +2 -0
- data/app/views/layouts/workarea/admin/application.html.haml +3 -1
- data/app/views/workarea/admin/changesets/index.html.haml +3 -1
- data/app/views/workarea/admin/content_assets/index.html.haml +2 -0
- data/app/views/workarea/admin/pricing_discount_code_lists/promo_codes.html.haml +2 -2
- data/app/views/workarea/admin/pricing_discount_code_lists/show.html.haml +1 -1
- data/app/views/workarea/admin/releases/show.html.haml +4 -4
- data/app/views/workarea/admin/segments/index.html.haml +1 -1
- data/app/views/workarea/admin/toolbar/show.html.haml +2 -0
- data/app/views/workarea/admin/users/permissions.html.haml +1 -1
- data/app/views/workarea/admin/users/show.html.haml +2 -2
- data/config/locales/en.yml +2 -0
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c6b46068c998bbe814822add9ab5e2cc9036905b1fff4051093c2d8312f2d959
|
|
4
|
+
data.tar.gz: 586a0e6ec7cc56a6fec6bb5bedcb5a1f3472f687b62c8185b585b264bb5ea6a6
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f12e56f8d1f0013c1f63da5aa37880f28da03fa746a9f8926574b1889ebbd8910e76dd7a6f63aeeaf41a1831ea388df9aacc74833a7b0e7f21423d6ec4d3f5e4
|
|
7
|
+
data.tar.gz: 518be2e9744c165d0dcbc31eaba2e4f31f531dba8adc977b11fab3c64cce694e4c36a8e1f2e8ab473fb5b48ff104cbb6dfb73bdefcd387d190b5fb0a39831379
|
|
@@ -31,9 +31,14 @@ WORKAREA.registerModule('remoteSelects', (function () {
|
|
|
31
31
|
$(select).data('remoteSelect').options
|
|
32
32
|
);
|
|
33
33
|
|
|
34
|
+
|
|
34
35
|
settings.ajax.url = $(select).data('remoteSelect').source;
|
|
35
36
|
settings.templateResult = formatOption;
|
|
36
37
|
|
|
38
|
+
if (settings.dropdownParent) {
|
|
39
|
+
settings.dropdownParent = $(settings.dropdownParent);
|
|
40
|
+
}
|
|
41
|
+
|
|
37
42
|
return settings;
|
|
38
43
|
},
|
|
39
44
|
|
|
@@ -73,9 +78,16 @@ WORKAREA.registerModule('remoteSelects', (function () {
|
|
|
73
78
|
},
|
|
74
79
|
|
|
75
80
|
initSelect2 = function (index, select) {
|
|
81
|
+
var config = getConfig(select);
|
|
82
|
+
|
|
76
83
|
injectHiddenInput(index, select);
|
|
84
|
+
$(select).select2(config);
|
|
77
85
|
|
|
78
|
-
|
|
86
|
+
if (config.autoSubmit) {
|
|
87
|
+
$(select).on('select2:select', function () {
|
|
88
|
+
$(this).parents('form').submit();
|
|
89
|
+
});
|
|
90
|
+
}
|
|
79
91
|
|
|
80
92
|
if ($(select).is('[multiple]')) {
|
|
81
93
|
initSortable(select);
|
|
@@ -117,3 +117,8 @@ $workflow-bar-button-confirm-delete-hover-bg-color: $bright-red !default;
|
|
|
117
117
|
background-color: $workflow-bar-button-confirm-delete-hover-bg-color;
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
|
+
|
|
121
|
+
.workflow-bar__button--disabled {
|
|
122
|
+
opacity: $forms-disabled-opacity;
|
|
123
|
+
cursor: not-allowed;
|
|
124
|
+
}
|
|
@@ -21,8 +21,9 @@ module Workarea
|
|
|
21
21
|
end
|
|
22
22
|
|
|
23
23
|
if attributes[:inventory].present?
|
|
24
|
-
inventory = Inventory::Sku.
|
|
24
|
+
inventory = Inventory::Sku.find_or_initialize_by(id: variant.sku)
|
|
25
25
|
inventory.available = attributes[:inventory]
|
|
26
|
+
inventory.policy = 'standard' if inventory.new_record?
|
|
26
27
|
inventory.save!
|
|
27
28
|
end
|
|
28
29
|
end
|
|
@@ -183,7 +183,9 @@
|
|
|
183
183
|
%li.menu__item= link_to t('workarea.admin.layout.log_out'), storefront.logout_path, data: { method: 'delete' }, class: 'menu__link'
|
|
184
184
|
|
|
185
185
|
.page-content
|
|
186
|
-
#main.page-content__main{ role: 'main' }
|
|
186
|
+
#main.page-content__main{ role: 'main' }
|
|
187
|
+
= append_partials('admin.page_content_top')
|
|
188
|
+
= yield
|
|
187
189
|
|
|
188
190
|
%p.visually-hidden= link_to t('workarea.admin.layout.top_of_page'), '#top'
|
|
189
191
|
= yield :javascript
|
|
@@ -14,7 +14,9 @@
|
|
|
14
14
|
= render_cards_for(@release, :planned_changes)
|
|
15
15
|
|
|
16
16
|
- if @release.changesets_with_releasable.blank?
|
|
17
|
-
|
|
17
|
+
.section.align-center
|
|
18
|
+
%p.heading.heading--3= t('workarea.admin.changesets.no_changesets')
|
|
19
|
+
%p.heading.heading--3= link_to t('workarea.admin.changesets.plan_some_changes'), release_releasables_path(@release)
|
|
18
20
|
|
|
19
21
|
.grid.grid--center
|
|
20
22
|
.grid__cell.grid__cell--80-at-medium
|
|
@@ -9,6 +9,8 @@
|
|
|
9
9
|
%h1.heading--no-margin= t('workarea.admin.content_assets.index.title')
|
|
10
10
|
%p= t('workarea.admin.content_assets.index.description')
|
|
11
11
|
|
|
12
|
+
= append_partials('admin.content_assets_index_view_heading')
|
|
13
|
+
|
|
12
14
|
.view__container
|
|
13
15
|
- if s3?
|
|
14
16
|
.direct-upload{ data: { direct_upload: { type: 'asset' }.to_json, unsaved_changes: '' } }
|
|
@@ -43,8 +43,8 @@
|
|
|
43
43
|
.grid__cell= link_to t('workarea.admin.shared.bulk_actions.import'), new_data_file_import_path(model_type: Workarea::Pricing::Discount::GeneratedPromoCode, return_to: pricing_discount_code_list_path(@code_list)), class: 'workflow-bar__button'
|
|
44
44
|
.grid__cell= link_to t('workarea.admin.shared.bulk_actions.export'), new_data_file_export_path(model_type: Workarea::Pricing::Discount::GeneratedPromoCode, query_id: generic_admin_search_query_id(model_type: Workarea::Pricing::Discount::GeneratedPromoCode, query_params: { code_list_id: @code_list.id }), return_to: pricing_discount_code_list_path(@code_list)), class: 'workflow-bar__button workflow-bar__button--left-divide'
|
|
45
45
|
- else
|
|
46
|
-
.grid__cell= link_to t('workarea.admin.shared.bulk_actions.import'), '#disabled-info', disabled: 'disabled', class: 'workflow-bar__button', data: { tooltip: '' }
|
|
47
|
-
.grid__cell= link_to t('workarea.admin.shared.bulk_actions.export'), '#disabled-info', disabled: 'disabled', class: 'workflow-bar__button
|
|
46
|
+
.grid__cell= link_to t('workarea.admin.shared.bulk_actions.import'), '#disabled-info', disabled: 'disabled', class: 'workflow-bar__button workflow-bar__button--disabled', data: { tooltip: '' }
|
|
47
|
+
.grid__cell= link_to t('workarea.admin.shared.bulk_actions.export'), '#disabled-info', disabled: 'disabled', class: 'workflow-bar__button workflow-bar__button--left-divide workflow-bar__button--disabled', data: { tooltip: '' }
|
|
48
48
|
|
|
49
49
|
#disabled-info.tooltip-content
|
|
50
50
|
%p= t('workarea.admin.pricing_discount_code_lists.show.disabled_info')
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
- if @code_list.generation_complete?
|
|
26
26
|
.grid__cell= link_to t('workarea.admin.actions.delete'), pricing_discount_code_list_path(@code_list), class: 'workflow-bar__button workflow-bar__button--delete', data: { method: 'delete', confirm: t('workarea.admin.actions.delete_confirmation') }
|
|
27
27
|
- else
|
|
28
|
-
.grid__cell= link_to t('workarea.admin.actions.delete'), '#disabled-info', disabled: 'disabled', class: 'workflow-bar__button workflow-bar__button--delete', data: { tooltip: '' }
|
|
28
|
+
.grid__cell= link_to t('workarea.admin.actions.delete'), '#disabled-info', disabled: 'disabled', class: 'workflow-bar__button workflow-bar__button--delete workflow-bar__button--disabled', data: { tooltip: '' }
|
|
29
29
|
|
|
30
30
|
#disabled-info.tooltip-content
|
|
31
31
|
%p= t('workarea.admin.pricing_discount_code_lists.show.disabled_info')
|
|
@@ -21,19 +21,19 @@
|
|
|
21
21
|
.grid.grid--auto.grid--right
|
|
22
22
|
- if !@release.has_changes?
|
|
23
23
|
.grid__cell
|
|
24
|
-
= link_to t('workarea.admin.releases.show.visit_storefront_to_preview'), '#no-changes-to-preview-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
|
|
24
|
+
= link_to t('workarea.admin.releases.show.visit_storefront_to_preview'), '#no-changes-to-preview-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update workflow-bar__button--disabled'
|
|
25
25
|
#no-changes-to-preview-info.tooltip-content
|
|
26
26
|
%p= t('workarea.admin.releases.show.no_changes_to_preview')
|
|
27
27
|
|
|
28
28
|
.grid__cell
|
|
29
|
-
= link_to t('workarea.admin.releases.show.publish_now'), '#no-changes-to-publish-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
|
|
29
|
+
= link_to t('workarea.admin.releases.show.publish_now'), '#no-changes-to-publish-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update workflow-bar__button--disabled'
|
|
30
30
|
#no-changes-to-publish-info.tooltip-content
|
|
31
31
|
%p= t('workarea.admin.releases.show.no_changes_to_publish')
|
|
32
32
|
|
|
33
33
|
- else
|
|
34
34
|
.grid__cell
|
|
35
35
|
- if @release.published? && !@release.scheduled?
|
|
36
|
-
= link_to t('workarea.admin.releases.show.visit_storefront_to_preview'), '#cannot-preview-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
|
|
36
|
+
= link_to t('workarea.admin.releases.show.visit_storefront_to_preview'), '#cannot-preview-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update workflow-bar__button--disabled'
|
|
37
37
|
#cannot-preview-info.tooltip-content
|
|
38
38
|
%p= t('workarea.admin.releases.show.unscheduled_republish_preview_info')
|
|
39
39
|
- elsif current_release.try(:id) == @release.id
|
|
@@ -50,6 +50,6 @@
|
|
|
50
50
|
= form_tag publish_release_path(@release), method: :patch do
|
|
51
51
|
= button_tag publish_text, value: 'publish', class: 'workflow-bar__button workflow-bar__button--update'
|
|
52
52
|
- else
|
|
53
|
-
= link_to publish_text, '#cannot-publish-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
|
|
53
|
+
= link_to publish_text, '#cannot-publish-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update workflow-bar__button--disabled'
|
|
54
54
|
#cannot-publish-info.tooltip-content
|
|
55
55
|
%p= t('workarea.admin.releases.show.user_cannot_publish_info')
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
|
|
57
57
|
.grid__cell.grid__cell--50.align-right
|
|
58
58
|
- if segments.size >= 15
|
|
59
|
-
= link_to t('workarea.admin.segments.index.add_custom'), '#max-segments-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--create'
|
|
59
|
+
= link_to t('workarea.admin.segments.index.add_custom'), '#max-segments-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--create workflow-bar__button--disabled'
|
|
60
60
|
#max-segments-info.tooltip-content
|
|
61
61
|
%p= t('workarea.admin.segments.index.max_segments')
|
|
62
62
|
|
|
@@ -32,6 +32,8 @@
|
|
|
32
32
|
= search_field_tag :q, nil, placeholder: t('workarea.admin.toolbar.search_placeholder'), title: t('workarea.admin.toolbar.search_title'), class: 'search-form__input', data: { categorized_autocomplete_field: '' }, id: 'admin_search', aria: { label: t('workarea.admin.toolbar.search_title') }
|
|
33
33
|
= submit_tag t('workarea.admin.toolbar.search'), class: 'search-form__button', value: 'search_admin'
|
|
34
34
|
|
|
35
|
+
= append_partials('admin.toolbar_header')
|
|
36
|
+
|
|
35
37
|
- if @model.present?
|
|
36
38
|
- unless @model.active?
|
|
37
39
|
.header__alert
|
|
@@ -136,6 +136,6 @@
|
|
|
136
136
|
|
|
137
137
|
.workflow-bar
|
|
138
138
|
.grid.grid--auto.grid--right.grid--middle
|
|
139
|
-
= append_partials('admin.user_permissions_workflow_bar')
|
|
139
|
+
= append_partials('admin.user_permissions_workflow_bar', user: @user)
|
|
140
140
|
- button_styles = @user.super_admin? ? 'workflow-bar__button' : 'workflow-bar__button workflow-bar__button--update'
|
|
141
141
|
.grid__cell= button_tag t('workarea.admin.users.permissions.button'), value: 'save_permissions', class: button_styles, disabled: @user.super_admin?
|
|
@@ -24,13 +24,13 @@
|
|
|
24
24
|
.grid.grid--auto.grid--right.grid--middle.grid--flush
|
|
25
25
|
- if @user == current_user
|
|
26
26
|
.grid__cell
|
|
27
|
-
= link_to t('workarea.admin.users.show.impersonate'), '#impersonate-yourself-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
|
|
27
|
+
= link_to t('workarea.admin.users.show.impersonate'), '#impersonate-yourself-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update workflow-bar__button--disabled'
|
|
28
28
|
#impersonate-yourself-info.tooltip-content
|
|
29
29
|
%p= t('workarea.admin.users.show.cant_impersonate_yourself')
|
|
30
30
|
|
|
31
31
|
- elsif @user.admin?
|
|
32
32
|
.grid__cell
|
|
33
|
-
= link_to t('workarea.admin.users.show.impersonate'), '#impersonate-other-admins-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
|
|
33
|
+
= link_to t('workarea.admin.users.show.impersonate'), '#impersonate-other-admins-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update workflow-bar__button--disabled'
|
|
34
34
|
#impersonate-other-admins-info.tooltip-content
|
|
35
35
|
%p= t('workarea.admin.users.show.cant_impersonate_other_administrators')
|
|
36
36
|
|
data/config/locales/en.yml
CHANGED
|
@@ -579,6 +579,8 @@ en:
|
|
|
579
579
|
flash_messages:
|
|
580
580
|
removed: These changes have been removed
|
|
581
581
|
no_activity: No activity to show
|
|
582
|
+
no_changesets: There aren't any planned changes for this release.
|
|
583
|
+
plan_some_changes: Go plan some changes!
|
|
582
584
|
planned_changes_for: Planned Changes For
|
|
583
585
|
published_on: Published On
|
|
584
586
|
publishes_on: Publishes On
|
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.5.
|
|
4
|
+
version: 3.5.18
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ben Crouse
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2020-
|
|
11
|
+
date: 2020-09-01 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.5.
|
|
19
|
+
version: 3.5.18
|
|
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.5.
|
|
26
|
+
version: 3.5.18
|
|
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.5.
|
|
33
|
+
version: 3.5.18
|
|
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.5.
|
|
40
|
+
version: 3.5.18
|
|
41
41
|
description: Provides site administration functionality for the Workarea Commerce
|
|
42
42
|
Platform.
|
|
43
43
|
email:
|