alchemy_cms 7.0.0.pre.a → 7.0.0.pre.b
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/brakeman-analysis.yml +2 -2
- data/.github/workflows/ci.yml +7 -7
- data/.github/workflows/lint.yml +17 -0
- data/.hound.yml +2 -3
- data/.rubocop.yml +4 -350
- data/.standard.yml +3 -0
- data/CHANGELOG.md +29 -0
- data/Gemfile +3 -1
- data/README.md +7 -9
- data/Rakefile +1 -1
- data/alchemy_cms.gemspec +2 -1
- data/app/assets/javascripts/alchemy/admin.js +0 -1
- data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +6 -1
- data/app/components/alchemy/ingredients/audio_view.rb +37 -0
- data/app/components/alchemy/ingredients/base_view.rb +38 -0
- data/app/components/alchemy/ingredients/boolean_view.rb +13 -0
- data/app/components/alchemy/ingredients/datetime_view.rb +22 -0
- data/app/components/alchemy/ingredients/file_view.rb +40 -0
- data/app/components/alchemy/ingredients/headline_view.rb +20 -0
- data/app/components/alchemy/ingredients/html_view.rb +9 -0
- data/app/components/alchemy/ingredients/link_view.rb +25 -0
- data/app/components/alchemy/ingredients/node_view.rb +11 -0
- data/app/components/alchemy/ingredients/page_view.rb +15 -0
- data/app/components/alchemy/ingredients/picture_view.rb +108 -0
- data/app/components/alchemy/ingredients/richtext_view.rb +22 -0
- data/app/components/alchemy/ingredients/select_view.rb +6 -0
- data/app/components/alchemy/ingredients/text_view.rb +41 -0
- data/app/components/alchemy/ingredients/video_view.rb +39 -0
- data/app/controllers/alchemy/admin/attachments_controller.rb +3 -3
- data/app/controllers/alchemy/admin/base_controller.rb +7 -7
- data/app/controllers/alchemy/admin/clipboard_controller.rb +2 -2
- data/app/controllers/alchemy/admin/elements_controller.rb +26 -11
- data/app/controllers/alchemy/admin/languages_controller.rb +1 -1
- data/app/controllers/alchemy/admin/nodes_controller.rb +2 -2
- data/app/controllers/alchemy/admin/pages_controller.rb +10 -10
- data/app/controllers/alchemy/admin/pictures_controller.rb +14 -14
- data/app/controllers/alchemy/admin/resources_controller.rb +27 -28
- data/app/controllers/alchemy/admin/styleguide_controller.rb +1 -0
- data/app/controllers/alchemy/admin/tags_controller.rb +11 -11
- data/app/controllers/alchemy/api/base_controller.rb +2 -2
- data/app/controllers/alchemy/api/elements_controller.rb +11 -11
- data/app/controllers/alchemy/api/ingredients_controller.rb +1 -1
- data/app/controllers/alchemy/api/nodes_controller.rb +1 -1
- data/app/controllers/alchemy/api/pages_controller.rb +11 -11
- data/app/controllers/alchemy/attachments_controller.rb +3 -3
- data/app/controllers/alchemy/base_controller.rb +1 -1
- data/app/controllers/alchemy/messages_controller.rb +9 -9
- data/app/controllers/alchemy/pages_controller.rb +8 -19
- data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +1 -0
- data/app/controllers/concerns/alchemy/admin/uploader_responses.rb +5 -7
- data/app/controllers/concerns/alchemy/legacy_page_redirects.rb +5 -5
- data/app/decorators/alchemy/element_editor.rb +4 -4
- data/app/decorators/alchemy/ingredient_editor.rb +6 -6
- data/app/helpers/alchemy/admin/attachments_helper.rb +1 -1
- data/app/helpers/alchemy/admin/base_helper.rb +21 -22
- data/app/helpers/alchemy/admin/elements_helper.rb +1 -1
- data/app/helpers/alchemy/admin/form_helper.rb +1 -1
- data/app/helpers/alchemy/admin/navigation_helper.rb +7 -7
- data/app/helpers/alchemy/admin/pages_helper.rb +2 -2
- data/app/helpers/alchemy/admin/tags_helper.rb +3 -3
- data/app/helpers/alchemy/base_helper.rb +2 -2
- data/app/helpers/alchemy/elements_block_helper.rb +9 -7
- data/app/helpers/alchemy/elements_helper.rb +12 -12
- data/app/helpers/alchemy/pages_helper.rb +11 -11
- data/app/helpers/alchemy/url_helper.rb +1 -1
- data/app/mailers/alchemy/messages_mailer.rb +1 -1
- data/app/models/alchemy/attachment.rb +6 -6
- data/app/models/alchemy/base_record.rb +1 -0
- data/app/models/alchemy/eager_loading.rb +6 -6
- data/app/models/alchemy/element/definitions.rb +1 -1
- data/app/models/alchemy/element/element_ingredients.rb +3 -3
- data/app/models/alchemy/element.rb +2 -2
- data/app/models/alchemy/elements_repository.rb +1 -1
- data/app/models/alchemy/image_cropper_settings.rb +2 -2
- data/app/models/alchemy/ingredient.rb +14 -12
- data/app/models/alchemy/ingredient_validator.rb +1 -1
- data/app/models/alchemy/ingredients/datetime.rb +1 -1
- data/app/models/alchemy/ingredients/file.rb +5 -5
- data/app/models/alchemy/ingredients/headline.rb +4 -4
- data/app/models/alchemy/ingredients/picture.rb +27 -9
- data/app/models/alchemy/ingredients/richtext.rb +15 -12
- data/app/models/alchemy/ingredients/text.rb +6 -6
- data/app/models/alchemy/language/code.rb +1 -1
- data/app/models/alchemy/language.rb +4 -4
- data/app/models/alchemy/legacy_page_url.rb +1 -1
- data/app/models/alchemy/node.rb +2 -2
- data/app/models/alchemy/page/page_elements.rb +14 -14
- data/app/models/alchemy/page/page_naming.rb +4 -4
- data/app/models/alchemy/page/page_natures.rb +1 -1
- data/app/models/alchemy/page/page_scopes.rb +5 -5
- data/app/models/alchemy/page.rb +11 -11
- data/app/models/alchemy/picture/calculations.rb +2 -2
- data/app/models/alchemy/picture/transformations.rb +2 -2
- data/app/models/alchemy/picture/url.rb +4 -4
- data/app/models/alchemy/picture.rb +11 -10
- data/app/models/alchemy/picture_thumb/create.rb +1 -1
- data/app/models/alchemy/picture_thumb.rb +1 -1
- data/app/models/alchemy/picture_variant.rb +2 -3
- data/app/models/alchemy/tag.rb +8 -0
- data/app/models/concerns/alchemy/picture_thumbnails.rb +6 -6
- data/app/serializers/alchemy/base_serializer.rb +1 -1
- data/app/serializers/alchemy/page_tree_serializer.rb +7 -7
- data/app/services/alchemy/duplicate_element.rb +3 -3
- data/app/services/alchemy/tag_validations.rb +1 -1
- data/app/views/alchemy/admin/elements/_element.html.erb +3 -0
- data/app/views/alchemy/admin/pages/edit.html.erb +0 -3
- data/app/views/alchemy/admin/pages/update.js.erb +10 -4
- data/app/views/alchemy/admin/pictures/_infos.html.erb +1 -1
- data/app/views/alchemy/ingredients/_audio_view.html.erb +1 -14
- data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -1
- data/app/views/alchemy/ingredients/_datetime_view.html.erb +3 -9
- data/app/views/alchemy/ingredients/_file_view.html.erb +3 -16
- data/app/views/alchemy/ingredients/_headline_view.html.erb +4 -10
- data/app/views/alchemy/ingredients/_html_view.html.erb +1 -1
- data/app/views/alchemy/ingredients/_link_view.html.erb +4 -9
- data/app/views/alchemy/ingredients/_node_view.html.erb +1 -1
- data/app/views/alchemy/ingredients/_page_view.html.erb +1 -4
- data/app/views/alchemy/ingredients/_picture_view.html.erb +4 -5
- data/app/views/alchemy/ingredients/_richtext_editor.html.erb +11 -2
- data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -3
- data/app/views/alchemy/ingredients/_select_view.html.erb +1 -1
- data/app/views/alchemy/ingredients/_text_view.html.erb +3 -19
- data/app/views/alchemy/ingredients/_video_view.html.erb +3 -18
- data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +1 -0
- data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +1 -0
- data/app/views/layouts/alchemy/admin.html.erb +7 -9
- data/bin/setup +37 -0
- data/bin/start +17 -0
- data/config/initializers/assets.rb +1 -0
- data/config/initializers/dragonfly.rb +1 -0
- data/config/initializers/mime_types.rb +1 -0
- data/config/initializers/mini_profiler.rb +1 -0
- data/config/initializers/simple_form.rb +3 -2
- data/config/locales/alchemy.en.yml +1 -1
- data/config/routes.rb +21 -20
- data/config/spring.rb +1 -0
- data/db/migrate/20230121212637_alchemy_six_point_one.rb +8 -8
- data/db/migrate/20230505132743_add_indexes_to_alchemy_pictures.rb +6 -0
- data/lib/alchemy/admin/locale.rb +3 -3
- data/lib/alchemy/admin/preview_url.rb +2 -2
- data/lib/alchemy/auth_accessors.rb +1 -1
- data/lib/alchemy/config.rb +1 -1
- data/lib/alchemy/controller_actions.rb +4 -4
- data/lib/alchemy/deprecation.rb +1 -0
- data/lib/alchemy/dragonfly/processors/thumbnail.rb +1 -1
- data/lib/alchemy/element_definition.rb +2 -2
- data/lib/alchemy/engine.rb +2 -1
- data/lib/alchemy/filetypes.rb +7 -7
- data/lib/alchemy/forms/builder.rb +4 -4
- data/lib/alchemy/i18n.rb +6 -4
- data/lib/alchemy/install/tasks.rb +2 -1
- data/lib/alchemy/name_conversions.rb +1 -1
- data/lib/alchemy/page_layout.rb +1 -1
- data/lib/alchemy/permissions.rb +5 -4
- data/lib/alchemy/resource.rb +10 -10
- data/lib/alchemy/resources_helper.rb +7 -7
- data/lib/alchemy/routing_constraints.rb +2 -2
- data/lib/alchemy/seeder.rb +12 -5
- data/lib/alchemy/shell.rb +2 -1
- data/lib/alchemy/taggable.rb +3 -2
- data/lib/alchemy/tasks/tidy.rb +1 -0
- data/lib/alchemy/test_support/capybara_helpers.rb +1 -1
- data/lib/alchemy/test_support/config_stubbing.rb +1 -0
- data/lib/alchemy/test_support/factories/element_factory.rb +4 -0
- data/lib/alchemy/test_support/factories/page_factory.rb +2 -2
- data/lib/alchemy/test_support/having_crop_action_examples.rb +9 -9
- data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +33 -33
- data/lib/alchemy/test_support/integration_helpers.rb +4 -3
- data/lib/alchemy/test_support/shared_contexts.rb +2 -1
- data/lib/alchemy/test_support/shared_dom_ids_examples.rb +9 -9
- data/lib/alchemy/test_support/shared_ingredient_examples.rb +12 -6
- data/lib/alchemy/test_support/shared_uploader_examples.rb +1 -0
- data/lib/alchemy/tinymce.rb +3 -26
- data/lib/alchemy/upgrader.rb +1 -0
- data/lib/alchemy/version.rb +1 -1
- data/lib/alchemy_cms.rb +1 -0
- data/lib/generators/alchemy/base.rb +3 -2
- data/lib/generators/alchemy/elements/elements_generator.rb +2 -1
- data/lib/generators/alchemy/ingredient/ingredient_generator.rb +1 -0
- data/lib/generators/alchemy/install/files/application.html.erb +1 -1
- data/lib/generators/alchemy/install/install_generator.rb +2 -1
- data/lib/generators/alchemy/module/module_generator.rb +1 -0
- data/lib/generators/alchemy/page_layouts/page_layouts_generator.rb +1 -0
- data/lib/generators/alchemy/site_layouts/site_layouts_generator.rb +1 -0
- data/lib/generators/alchemy/views/views_generator.rb +2 -1
- data/lib/tasks/alchemy/thumbnails.rake +5 -5
- data/lib/tasks/alchemy/tidy.rake +1 -0
- data/lib/tasks/alchemy/upgrade.rake +6 -5
- data/package/admin.js +2 -0
- data/package/dist/admin.js +3 -3
- data/package/dist/admin.js.map +4 -4
- data/package/src/datepicker.js +1 -0
- data/package/src/tinymce.js +142 -0
- data/package.json +2 -2
- metadata +39 -7
- data/app/assets/javascripts/alchemy/alchemy.tinymce.js.coffee +0 -93
- data/app/presenters/alchemy/picture_view.rb +0 -88
- data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +0 -10
@@ -36,18 +36,18 @@ module Alchemy
|
|
36
36
|
|
37
37
|
alchemy.show_page_path(
|
38
38
|
locale: prefix_locale? ? page.language_code : nil,
|
39
|
-
urlname: page.urlname
|
39
|
+
urlname: page.urlname
|
40
40
|
)
|
41
41
|
end
|
42
42
|
|
43
43
|
def legacy_urls
|
44
44
|
# /slug/tree => slug/tree
|
45
|
-
urlname = (request.fullpath[1
|
45
|
+
urlname = (request.fullpath[1..] if request.fullpath[0] == "/") || request.fullpath
|
46
46
|
LegacyPageUrl.joins(:page).where(
|
47
|
-
urlname
|
47
|
+
:urlname => urlname,
|
48
48
|
Page.table_name => {
|
49
|
-
language_id: Language.current.id
|
50
|
-
}
|
49
|
+
language_id: Language.current.id
|
50
|
+
}
|
51
51
|
)
|
52
52
|
end
|
53
53
|
|
@@ -44,7 +44,7 @@ module Alchemy
|
|
44
44
|
Alchemy.t(
|
45
45
|
group,
|
46
46
|
scope: "element_groups.#{element.name}",
|
47
|
-
default: Alchemy.t("element_groups.#{group}", default: group.humanize)
|
47
|
+
default: Alchemy.t("element_groups.#{group}", default: group.humanize)
|
48
48
|
)
|
49
49
|
end
|
50
50
|
|
@@ -59,7 +59,7 @@ module Alchemy
|
|
59
59
|
compact? ? "compact" : nil,
|
60
60
|
deprecated? ? "deprecated" : nil,
|
61
61
|
fixed? ? "is-fixed" : "not-fixed",
|
62
|
-
public? ? "visible" : "hidden"
|
62
|
+
public? ? "visible" : "hidden"
|
63
63
|
].join(" ")
|
64
64
|
end
|
65
65
|
|
@@ -117,7 +117,7 @@ module Alchemy
|
|
117
117
|
Alchemy.t(
|
118
118
|
name,
|
119
119
|
scope: :element_deprecation_notices,
|
120
|
-
default: Alchemy.t(:element_deprecated)
|
120
|
+
default: Alchemy.t(:element_deprecated)
|
121
121
|
)
|
122
122
|
end
|
123
123
|
end
|
@@ -128,7 +128,7 @@ module Alchemy
|
|
128
128
|
element.ingredients.detect { |i| i.role == definition[:role] } ||
|
129
129
|
element.ingredients.create!(
|
130
130
|
role: definition[:role],
|
131
|
-
type: Alchemy::Ingredient.normalize_type(definition[:type])
|
131
|
+
type: Alchemy::Ingredient.normalize_type(definition[:type])
|
132
132
|
)
|
133
133
|
end
|
134
134
|
end
|
@@ -27,7 +27,7 @@ module Alchemy
|
|
27
27
|
Alchemy.t(
|
28
28
|
role,
|
29
29
|
scope: "ingredient_roles.#{element.name}",
|
30
|
-
default: Alchemy.t("ingredient_roles.#{role}", default: role.humanize)
|
30
|
+
default: Alchemy.t("ingredient_roles.#{role}", default: role.humanize)
|
31
31
|
)
|
32
32
|
end
|
33
33
|
|
@@ -36,17 +36,17 @@ module Alchemy
|
|
36
36
|
"ingredient-editor",
|
37
37
|
partial_name,
|
38
38
|
deprecated? ? "deprecated" : nil,
|
39
|
-
respond_to?(:level_options) && level_options.many? ? "with-level-select" : nil,
|
40
|
-
respond_to?(:size_options) && size_options.many? ? "with-size-select" : nil,
|
39
|
+
(respond_to?(:level_options) && level_options.many?) ? "with-level-select" : nil,
|
40
|
+
(respond_to?(:size_options) && size_options.many?) ? "with-size-select" : nil,
|
41
41
|
settings[:linkable] ? "linkable" : nil,
|
42
|
-
settings[:anchor] ? "with-anchor" : nil
|
42
|
+
settings[:anchor] ? "with-anchor" : nil
|
43
43
|
].compact
|
44
44
|
end
|
45
45
|
|
46
46
|
def data_attributes
|
47
47
|
{
|
48
48
|
ingredient_id: id,
|
49
|
-
ingredient_role: role
|
49
|
+
ingredient_role: role
|
50
50
|
}
|
51
51
|
end
|
52
52
|
|
@@ -148,7 +148,7 @@ module Alchemy
|
|
148
148
|
Alchemy.t(
|
149
149
|
role,
|
150
150
|
scope: [:ingredient_deprecation_notices, element.name],
|
151
|
-
default: Alchemy.t(:ingredient_deprecated)
|
151
|
+
default: Alchemy.t(:ingredient_deprecated)
|
152
152
|
)
|
153
153
|
end
|
154
154
|
end
|
@@ -100,7 +100,7 @@ module Alchemy
|
|
100
100
|
def js_filter_field(items, options = {})
|
101
101
|
options = {
|
102
102
|
class: "js_filter_field",
|
103
|
-
data: {"alchemy-list-filter" => items}
|
103
|
+
data: {"alchemy-list-filter" => items}
|
104
104
|
}.merge(options)
|
105
105
|
content_tag(:div, class: "js_filter_field_box") do
|
106
106
|
concat text_field_tag(nil, nil, options)
|
@@ -140,10 +140,9 @@ module Alchemy
|
|
140
140
|
title: Alchemy.t(:please_confirm),
|
141
141
|
message: message,
|
142
142
|
ok_label: Alchemy.t("Yes"),
|
143
|
-
cancel_label: Alchemy.t("No")
|
144
|
-
}.to_json
|
145
|
-
)
|
146
|
-
)
|
143
|
+
cancel_label: Alchemy.t("No")
|
144
|
+
}.to_json
|
145
|
+
))
|
147
146
|
end
|
148
147
|
|
149
148
|
# Returns a form and a button that opens a modal confirm dialog.
|
@@ -170,7 +169,7 @@ module Alchemy
|
|
170
169
|
message: Alchemy.t(:confirm_to_proceed),
|
171
170
|
ok_label: Alchemy.t("Yes"),
|
172
171
|
title: Alchemy.t(:please_confirm),
|
173
|
-
cancel_label: Alchemy.t("No")
|
172
|
+
cancel_label: Alchemy.t("No")
|
174
173
|
}.merge(options)
|
175
174
|
form_tag url, {method: html_options.delete(:method), class: "button-with-confirm"} do
|
176
175
|
button_tag value, html_options.merge("data-alchemy-confirm" => options.to_json)
|
@@ -190,26 +189,26 @@ module Alchemy
|
|
190
189
|
options = {
|
191
190
|
title: Alchemy.t("Delete"),
|
192
191
|
message: Alchemy.t("Are you sure?"),
|
193
|
-
icon: :minus
|
192
|
+
icon: :minus
|
194
193
|
}.merge(options)
|
195
194
|
button_with_confirm(
|
196
195
|
render_icon(options[:icon]),
|
197
196
|
url, {
|
198
|
-
message: options[:message]
|
197
|
+
message: options[:message]
|
199
198
|
}, {
|
200
199
|
method: "delete",
|
201
200
|
title: options[:title],
|
202
|
-
class: "icon_button #{html_options.delete(:class)}".strip
|
201
|
+
class: "icon_button #{html_options.delete(:class)}".strip
|
203
202
|
}.merge(html_options)
|
204
203
|
)
|
205
204
|
end
|
206
205
|
|
207
206
|
# (internal) Renders translated Module Names for html title element.
|
208
207
|
def render_alchemy_title
|
209
|
-
if content_for?(:title)
|
210
|
-
|
208
|
+
title = if content_for?(:title)
|
209
|
+
content_for(:title)
|
211
210
|
else
|
212
|
-
|
211
|
+
Alchemy.t(controller_name, scope: :modules)
|
213
212
|
end
|
214
213
|
"Alchemy CMS - #{title}"
|
215
214
|
end
|
@@ -259,11 +258,11 @@ module Alchemy
|
|
259
258
|
active: false,
|
260
259
|
link_options: {},
|
261
260
|
dialog_options: {},
|
262
|
-
loading_indicator: false
|
261
|
+
loading_indicator: false
|
263
262
|
}.merge(options.symbolize_keys)
|
264
263
|
button = render(
|
265
264
|
"alchemy/admin/partials/toolbar_button",
|
266
|
-
options: options
|
265
|
+
options: options
|
267
266
|
)
|
268
267
|
if options[:skip_permission_check] || can?(*permission_from_options(options))
|
269
268
|
button
|
@@ -321,10 +320,10 @@ module Alchemy
|
|
321
320
|
type = html_options.delete(:type) || "date"
|
322
321
|
date = html_options.delete(:value) || object.send(method.to_sym).presence
|
323
322
|
date = Time.zone.parse(date) if date.is_a?(String)
|
324
|
-
value = date
|
323
|
+
value = date&.iso8601
|
325
324
|
|
326
325
|
text_field object.class.name.demodulize.underscore.to_sym,
|
327
|
-
method.to_sym, {type
|
326
|
+
method.to_sym, {:type => "text", :class => type, "data-datepicker-type" => type, :value => value}.merge(html_options)
|
328
327
|
end
|
329
328
|
|
330
329
|
# Render a hint icon with tooltip for given object.
|
@@ -344,17 +343,17 @@ module Alchemy
|
|
344
343
|
controller_name,
|
345
344
|
action_name,
|
346
345
|
content_for(:main_menu_style),
|
347
|
-
content_for(:alchemy_body_class)
|
346
|
+
content_for(:alchemy_body_class)
|
348
347
|
].compact
|
349
348
|
end
|
350
349
|
|
351
350
|
# (internal) Returns options for the clipboard select tag
|
352
351
|
def clipboard_select_tag_options(items)
|
353
352
|
options = items.map do |item|
|
354
|
-
if item.respond_to?(:display_name_with_preview_text)
|
355
|
-
|
353
|
+
name = if item.respond_to?(:display_name_with_preview_text)
|
354
|
+
item.display_name_with_preview_text
|
356
355
|
else
|
357
|
-
|
356
|
+
item.name
|
358
357
|
end
|
359
358
|
[name, item.id]
|
360
359
|
end
|
@@ -386,7 +385,7 @@ module Alchemy
|
|
386
385
|
# that explains the user that the page layout is missing
|
387
386
|
def page_layout_missing_warning
|
388
387
|
hint_with_tooltip(
|
389
|
-
Alchemy.t(:page_definition_missing)
|
388
|
+
Alchemy.t(:page_definition_missing)
|
390
389
|
)
|
391
390
|
end
|
392
391
|
|
@@ -404,7 +403,7 @@ module Alchemy
|
|
404
403
|
action_controller = options[:url].gsub(/\A\//, "").split("/")
|
405
404
|
[
|
406
405
|
action_controller.last.to_sym,
|
407
|
-
action_controller[0..action_controller.length - 2].join("_").to_sym
|
406
|
+
action_controller[0..action_controller.length - 2].join("_").to_sym
|
408
407
|
]
|
409
408
|
end
|
410
409
|
end
|
@@ -19,7 +19,7 @@ module Alchemy
|
|
19
19
|
options[:remote] = request.xhr?
|
20
20
|
options[:html] = {
|
21
21
|
id: options.delete(:id),
|
22
|
-
class: ["alchemy", options.delete(:class)].compact.join(" ")
|
22
|
+
class: ["alchemy", options.delete(:class)].compact.join(" ")
|
23
23
|
}
|
24
24
|
simple_form_for(object, *(args << options), &block)
|
25
25
|
end
|
@@ -14,7 +14,7 @@ module Alchemy
|
|
14
14
|
render(
|
15
15
|
"alchemy/admin/partials/main_navigation_entry",
|
16
16
|
alchemy_module: alchemy_module,
|
17
|
-
navigation: alchemy_module["navigation"]
|
17
|
+
navigation: alchemy_module["navigation"]
|
18
18
|
)
|
19
19
|
end
|
20
20
|
|
@@ -37,7 +37,7 @@ module Alchemy
|
|
37
37
|
def navigate_module(navigation)
|
38
38
|
[
|
39
39
|
navigation["action"].to_sym,
|
40
|
-
navigation["controller"].to_s.gsub(/\A\//, "").
|
40
|
+
navigation["controller"].to_s.gsub(/\A\//, "").tr("/", "_").to_sym
|
41
41
|
]
|
42
42
|
end
|
43
43
|
|
@@ -47,7 +47,7 @@ module Alchemy
|
|
47
47
|
[
|
48
48
|
"main_navi_entry",
|
49
49
|
admin_mainnavi_active?(navigation) ? "active" : nil,
|
50
|
-
navigation.key?("sub_navigation") ? "has_sub_navigation" : nil
|
50
|
+
navigation.key?("sub_navigation") ? "has_sub_navigation" : nil
|
51
51
|
].compact
|
52
52
|
end
|
53
53
|
|
@@ -75,7 +75,7 @@ module Alchemy
|
|
75
75
|
def url_for_module(alchemy_module)
|
76
76
|
route_from_engine_or_main_app(
|
77
77
|
alchemy_module["engine_name"],
|
78
|
-
url_options_for_module(alchemy_module)
|
78
|
+
url_options_for_module(alchemy_module)
|
79
79
|
)
|
80
80
|
end
|
81
81
|
|
@@ -94,7 +94,7 @@ module Alchemy
|
|
94
94
|
|
95
95
|
route_from_engine_or_main_app(
|
96
96
|
alchemy_module["engine_name"],
|
97
|
-
url_options_for_navigation_entry(navigation)
|
97
|
+
url_options_for_navigation_entry(navigation)
|
98
98
|
)
|
99
99
|
end
|
100
100
|
|
@@ -126,7 +126,7 @@ module Alchemy
|
|
126
126
|
#
|
127
127
|
def route_from_engine_or_main_app(engine_name, url_options)
|
128
128
|
if engine_name.present?
|
129
|
-
eval(engine_name).url_for(url_options)
|
129
|
+
eval(engine_name).url_for(url_options) # rubocop:disable Security/Eval
|
130
130
|
else
|
131
131
|
main_app.url_for(url_options)
|
132
132
|
end
|
@@ -151,7 +151,7 @@ module Alchemy
|
|
151
151
|
controller: entry["controller"],
|
152
152
|
action: entry["action"],
|
153
153
|
only_path: true,
|
154
|
-
params: entry["params"]
|
154
|
+
params: entry["params"]
|
155
155
|
}.delete_if { |_k, v| v.nil? }
|
156
156
|
end
|
157
157
|
|
@@ -15,7 +15,7 @@ module Alchemy
|
|
15
15
|
[Alchemy.t("480", scope: "preview_sizes"), 480],
|
16
16
|
[Alchemy.t("768", scope: "preview_sizes"), 768],
|
17
17
|
[Alchemy.t("1024", scope: "preview_sizes"), 1024],
|
18
|
-
[Alchemy.t("1280", scope: "preview_sizes"), 1280]
|
18
|
+
[Alchemy.t("1280", scope: "preview_sizes"), 1280]
|
19
19
|
])
|
20
20
|
end
|
21
21
|
|
@@ -27,7 +27,7 @@ module Alchemy
|
|
27
27
|
if page.persisted? && page.definition.blank?
|
28
28
|
[
|
29
29
|
page_layout_missing_warning,
|
30
|
-
Alchemy.t(:page_type)
|
30
|
+
Alchemy.t(:page_type)
|
31
31
|
].join(" ").html_safe
|
32
32
|
else
|
33
33
|
Alchemy.t(:page_type)
|
@@ -20,10 +20,10 @@ module Alchemy
|
|
20
20
|
"#{tag.name} (#{tag.taggings_count})",
|
21
21
|
url_for(
|
22
22
|
search_filter_params.except(:page, :tagged_with).merge(
|
23
|
-
tagged_with: tags_for_filter(current: tag).presence
|
24
|
-
)
|
23
|
+
tagged_with: tags_for_filter(current: tag).presence
|
24
|
+
)
|
25
25
|
),
|
26
|
-
remote: request.xhr
|
26
|
+
remote: request.xhr?
|
27
27
|
)
|
28
28
|
end
|
29
29
|
end.join.html_safe
|
@@ -34,7 +34,7 @@ module Alchemy
|
|
34
34
|
"fa#{options[:style].first}",
|
35
35
|
options[:size] ? "fa-#{options[:size]}" : nil,
|
36
36
|
options[:transform] ? "fa-#{options[:transform]}" : nil,
|
37
|
-
options[:class]
|
37
|
+
options[:class]
|
38
38
|
].compact
|
39
39
|
content_tag("i", nil, class: classes)
|
40
40
|
end
|
@@ -51,7 +51,7 @@ module Alchemy
|
|
51
51
|
#
|
52
52
|
def render_message(type = :info, msg = nil, &blk)
|
53
53
|
icon_class = message_icon_class(type)
|
54
|
-
if
|
54
|
+
if blk
|
55
55
|
content_tag :div, render_icon(icon_class) + capture(&blk), class: "#{type} message"
|
56
56
|
else
|
57
57
|
content_tag :div, render_icon(icon_class) + msg, class: "#{type} message"
|
@@ -32,10 +32,12 @@ module Alchemy
|
|
32
32
|
renderable = element.ingredient_by_role(name)
|
33
33
|
return if renderable.nil?
|
34
34
|
|
35
|
-
helpers.render(
|
36
|
-
|
37
|
-
|
38
|
-
|
35
|
+
helpers.render(
|
36
|
+
renderable.as_view_component(
|
37
|
+
options: options,
|
38
|
+
html_options: html_options
|
39
|
+
)
|
40
|
+
)
|
39
41
|
end
|
40
42
|
|
41
43
|
# Returns the value of one of the element's ingredients.
|
@@ -102,7 +104,7 @@ module Alchemy
|
|
102
104
|
tag: :div,
|
103
105
|
id: element.dom_id,
|
104
106
|
class: element.name,
|
105
|
-
tags_formatter: ->(tags) { tags.join(" ") }
|
107
|
+
tags_formatter: ->(tags) { tags.join(" ") }
|
106
108
|
}.merge(options)
|
107
109
|
|
108
110
|
# capture inner template block
|
@@ -111,12 +113,12 @@ module Alchemy
|
|
111
113
|
end
|
112
114
|
|
113
115
|
# wrap output in a useful DOM element
|
114
|
-
if tag = options.delete(:tag)
|
116
|
+
if (tag = options.delete(:tag))
|
115
117
|
# add preview attributes
|
116
118
|
options.merge!(element_preview_code_attributes(element))
|
117
119
|
|
118
120
|
# add tags
|
119
|
-
if tags_formatter = options.delete(:tags_formatter)
|
121
|
+
if (tags_formatter = options.delete(:tags_formatter))
|
120
122
|
options.merge!(element_tags_attributes(element, formatter: tags_formatter))
|
121
123
|
end
|
122
124
|
|
@@ -73,22 +73,22 @@ module Alchemy
|
|
73
73
|
def render_elements(options = {}, &blk)
|
74
74
|
options = {
|
75
75
|
from_page: @page,
|
76
|
-
render_format: "html"
|
76
|
+
render_format: "html"
|
77
77
|
}.update(options)
|
78
78
|
|
79
79
|
finder = options[:finder] || Alchemy::ElementsFinder.new(options)
|
80
80
|
|
81
81
|
page_version = if @preview_mode
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
82
|
+
options[:from_page]&.draft_version
|
83
|
+
else
|
84
|
+
options[:from_page]&.public_version
|
85
|
+
end
|
86
86
|
|
87
87
|
elements = finder.elements(page_version: page_version)
|
88
88
|
|
89
89
|
default_rendering = ->(element, i) { render_element(element, options, i + 1) }
|
90
90
|
capture do
|
91
|
-
if
|
91
|
+
if blk
|
92
92
|
elements.map.with_index(&blk)
|
93
93
|
else
|
94
94
|
elements.map.with_index(&default_rendering)
|
@@ -143,7 +143,7 @@ module Alchemy
|
|
143
143
|
def render_element(element, options = {}, counter = 1)
|
144
144
|
if element.nil?
|
145
145
|
warning("Element is nil")
|
146
|
-
render "alchemy/elements/view_not_found", {
|
146
|
+
render "alchemy/elements/view_not_found", {name: "nil"}
|
147
147
|
return
|
148
148
|
end
|
149
149
|
|
@@ -155,8 +155,8 @@ module Alchemy
|
|
155
155
|
locals: {
|
156
156
|
element: element,
|
157
157
|
counter: counter,
|
158
|
-
options: options.except(:locals, :partial)
|
159
|
-
}.merge(options[:locals] || {})
|
158
|
+
options: options.except(:locals, :partial)
|
159
|
+
}.merge(options[:locals] || {})
|
160
160
|
)
|
161
161
|
rescue ActionView::MissingTemplate => e
|
162
162
|
warning(%(
|
@@ -175,7 +175,7 @@ module Alchemy
|
|
175
175
|
def element_preview_code_attributes(element)
|
176
176
|
return {} unless element.present? && @preview_mode && element.page == @page
|
177
177
|
|
178
|
-
{
|
178
|
+
{"data-alchemy-element" => element.id}
|
179
179
|
end
|
180
180
|
|
181
181
|
# Returns the element's tags information as a string. Parameters and options
|
@@ -203,12 +203,12 @@ module Alchemy
|
|
203
203
|
#
|
204
204
|
def element_tags_attributes(element, options = {})
|
205
205
|
options = {
|
206
|
-
formatter: lambda { |tags| tags.join(" ") }
|
206
|
+
formatter: lambda { |tags| tags.join(" ") }
|
207
207
|
}.merge(options)
|
208
208
|
|
209
209
|
return {} if !element.taggable? || element.tag_list.blank?
|
210
210
|
|
211
|
-
{
|
211
|
+
{"data-element-tags" => options[:formatter].call(element.tag_list)}
|
212
212
|
end
|
213
213
|
end
|
214
214
|
end
|
@@ -24,7 +24,7 @@ module Alchemy
|
|
24
24
|
linkname: "name",
|
25
25
|
show_title: true,
|
26
26
|
spacer: "",
|
27
|
-
reverse: false
|
27
|
+
reverse: false
|
28
28
|
}.merge(options)
|
29
29
|
languages = Language.on_current_site.published.with_root_page.order("name #{options[:reverse] ? "DESC" : "ASC"}")
|
30
30
|
return nil if languages.count < 2
|
@@ -33,7 +33,7 @@ module Alchemy
|
|
33
33
|
partial: "alchemy/language_links/language",
|
34
34
|
collection: languages,
|
35
35
|
spacer_template: "alchemy/language_links/spacer",
|
36
|
-
locals: {
|
36
|
+
locals: {languages: languages, options: options}
|
37
37
|
)
|
38
38
|
end
|
39
39
|
|
@@ -79,7 +79,7 @@ module Alchemy
|
|
79
79
|
def render_menu(menu_type, options = {})
|
80
80
|
root_node = Alchemy::Node.roots.find_by(
|
81
81
|
menu_type: menu_type,
|
82
|
-
language: Alchemy::Language.current
|
82
|
+
language: Alchemy::Language.current
|
83
83
|
)
|
84
84
|
if root_node.nil?
|
85
85
|
warning("Menu with type #{menu_type} not found!")
|
@@ -110,12 +110,12 @@ module Alchemy
|
|
110
110
|
page: @page,
|
111
111
|
restricted_only: false,
|
112
112
|
reverse: false,
|
113
|
-
link_active_page: false
|
113
|
+
link_active_page: false
|
114
114
|
}.merge(options)
|
115
115
|
|
116
|
-
pages = options[:page]
|
117
|
-
self_and_ancestors.contentpages
|
118
|
-
published
|
116
|
+
pages = options[:page]
|
117
|
+
.self_and_ancestors.contentpages
|
118
|
+
.published
|
119
119
|
|
120
120
|
if options.delete(:restricted_only)
|
121
121
|
pages = pages.restricted
|
@@ -146,13 +146,13 @@ module Alchemy
|
|
146
146
|
options = {
|
147
147
|
prefix: "",
|
148
148
|
suffix: "",
|
149
|
-
separator: ""
|
149
|
+
separator: ""
|
150
150
|
}.update(options)
|
151
151
|
title_parts = [options[:prefix]]
|
152
|
-
if response.status == 200
|
153
|
-
|
152
|
+
title_parts << if response.status == 200
|
153
|
+
@page.title
|
154
154
|
else
|
155
|
-
|
155
|
+
response.status
|
156
156
|
end
|
157
157
|
title_parts << options[:suffix]
|
158
158
|
title_parts.reject(&:blank?).join(options[:separator]).html_safe
|
@@ -20,7 +20,7 @@ module Alchemy
|
|
20
20
|
def show_page_path_params(page, optional_params = {})
|
21
21
|
raise ArgumentError, "Page is nil" if page.nil?
|
22
22
|
|
23
|
-
url_params = {
|
23
|
+
url_params = {urlname: page.urlname}.update(optional_params)
|
24
24
|
prefix_locale?(page.language_code) ? url_params.update(locale: page.language_code) : url_params
|
25
25
|
end
|
26
26
|
|
@@ -40,7 +40,7 @@ module Alchemy
|
|
40
40
|
|
41
41
|
scope :by_file_type, ->(file_type) { where(file_mime_type: file_type) }
|
42
42
|
scope :recent, -> { where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) }
|
43
|
-
scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: {
|
43
|
+
scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: {id: nil}) }
|
44
44
|
|
45
45
|
# We need to define this method here to have it available in the validations below.
|
46
46
|
class << self
|
@@ -62,12 +62,12 @@ module Alchemy
|
|
62
62
|
[
|
63
63
|
{
|
64
64
|
name: :by_file_type,
|
65
|
-
values: distinct.pluck(:file_mime_type).map { |type| [Alchemy.t(type, scope: "mime_types"), type] }.sort_by(&:first)
|
65
|
+
values: distinct.pluck(:file_mime_type).map { |type| [Alchemy.t(type, scope: "mime_types"), type] }.sort_by(&:first)
|
66
66
|
},
|
67
67
|
{
|
68
68
|
name: :misc,
|
69
|
-
values: %w
|
70
|
-
}
|
69
|
+
values: %w[recent last_upload without_tag]
|
70
|
+
}
|
71
71
|
]
|
72
72
|
end
|
73
73
|
|
@@ -79,7 +79,7 @@ module Alchemy
|
|
79
79
|
end
|
80
80
|
|
81
81
|
def searchable_alchemy_resource_attributes
|
82
|
-
%w
|
82
|
+
%w[name file_name]
|
83
83
|
end
|
84
84
|
|
85
85
|
def allowed_filetypes
|
@@ -106,7 +106,7 @@ module Alchemy
|
|
106
106
|
{
|
107
107
|
"name" => read_attribute(:file_name),
|
108
108
|
"size" => read_attribute(:file_size),
|
109
|
-
"error" => errors[:file].join
|
109
|
+
"error" => errors[:file].join
|
110
110
|
}
|
111
111
|
end
|
112
112
|
|
@@ -20,18 +20,18 @@ module Alchemy
|
|
20
20
|
[
|
21
21
|
:tags,
|
22
22
|
{
|
23
|
-
language
|
23
|
+
:language => :site,
|
24
24
|
version => {
|
25
25
|
elements: [
|
26
26
|
:page,
|
27
27
|
:touchable_pages,
|
28
28
|
:tags,
|
29
29
|
{
|
30
|
-
ingredients: :related_object
|
31
|
-
}
|
32
|
-
]
|
33
|
-
}
|
34
|
-
}
|
30
|
+
ingredients: :related_object
|
31
|
+
}
|
32
|
+
]
|
33
|
+
}
|
34
|
+
}
|
35
35
|
]
|
36
36
|
end
|
37
37
|
end
|
@@ -41,7 +41,7 @@ module Alchemy
|
|
41
41
|
# The definition of this element.
|
42
42
|
#
|
43
43
|
def definition
|
44
|
-
if definition = self.class.definition_by_name(name)
|
44
|
+
if (definition = self.class.definition_by_name(name))
|
45
45
|
definition
|
46
46
|
else
|
47
47
|
log_warning "Could not find element definition for #{name}. " \
|