alchemy_cms 5.3.7 → 6.0.0.b1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (302) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/ci.yml +6 -14
  3. data/.gitignore +1 -1
  4. data/.hound.yml +1 -1
  5. data/.rubocop.yml +46 -4
  6. data/CHANGELOG.md +80 -84
  7. data/Gemfile +4 -2
  8. data/README.md +5 -2
  9. data/Rakefile +0 -18
  10. data/alchemy_cms.gemspec +78 -65
  11. data/app/assets/javascripts/alchemy/admin.js +2 -2
  12. data/app/assets/javascripts/alchemy/alchemy.base.js.coffee +0 -30
  13. data/app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee +2 -1
  14. data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee +2 -7
  15. data/app/assets/javascripts/alchemy/alchemy.dragndrop.js.coffee +0 -25
  16. data/app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee +1 -1
  17. data/app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee +2 -0
  18. data/app/assets/javascripts/alchemy/alchemy.fixed_elements.js +1 -1
  19. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +3 -1
  20. data/app/assets/javascripts/alchemy/alchemy.image_overlay.coffee +1 -1
  21. data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee +41 -30
  22. data/app/assets/javascripts/alchemy/alchemy.page_sorter.js +24 -0
  23. data/app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee +119 -0
  24. data/app/assets/javascripts/alchemy/page_select.js +8 -13
  25. data/app/assets/javascripts/alchemy/templates/index.js +0 -1
  26. data/app/assets/javascripts/alchemy/templates/node_folder.hbs +1 -1
  27. data/app/assets/javascripts/alchemy/templates/page.hbs +7 -17
  28. data/app/assets/stylesheets/alchemy/admin.scss +1 -1
  29. data/app/assets/stylesheets/alchemy/archive.scss +4 -8
  30. data/app/assets/stylesheets/alchemy/buttons.scss +0 -4
  31. data/app/assets/stylesheets/alchemy/elements.scss +73 -61
  32. data/app/assets/stylesheets/alchemy/images.scss +8 -0
  33. data/app/assets/stylesheets/alchemy/node-select.scss +4 -3
  34. data/app/assets/stylesheets/alchemy/page-select.scss +5 -29
  35. data/app/assets/stylesheets/alchemy/selects.scss +4 -0
  36. data/app/assets/stylesheets/alchemy/sitemap.scss +7 -9
  37. data/app/assets/stylesheets/tinymce/skins/alchemy/content.min.css.scss +3 -3
  38. data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss +7 -7
  39. data/app/controllers/alchemy/admin/attachments_controller.rb +6 -2
  40. data/app/controllers/alchemy/admin/base_controller.rb +8 -16
  41. data/app/controllers/alchemy/admin/elements_controller.rb +58 -34
  42. data/app/controllers/alchemy/admin/essence_audios_controller.rb +30 -0
  43. data/app/controllers/alchemy/admin/essence_files_controller.rb +0 -14
  44. data/app/controllers/alchemy/admin/essence_pictures_controller.rb +8 -79
  45. data/app/controllers/alchemy/admin/essence_videos_controller.rb +33 -0
  46. data/app/controllers/alchemy/admin/ingredients_controller.rb +30 -0
  47. data/app/controllers/alchemy/admin/layoutpages_controller.rb +0 -1
  48. data/app/controllers/alchemy/admin/pages_controller.rb +19 -23
  49. data/app/controllers/alchemy/admin/pictures_controller.rb +35 -9
  50. data/app/controllers/alchemy/api/elements_controller.rb +10 -5
  51. data/app/controllers/alchemy/api/nodes_controller.rb +0 -1
  52. data/app/controllers/alchemy/api/pages_controller.rb +3 -15
  53. data/app/controllers/concerns/alchemy/admin/archive_overlay.rb +13 -3
  54. data/app/controllers/concerns/alchemy/admin/crop_action.rb +26 -0
  55. data/app/decorators/alchemy/element_editor.rb +23 -1
  56. data/app/decorators/alchemy/ingredient_editor.rb +154 -0
  57. data/app/helpers/alchemy/admin/elements_helper.rb +1 -0
  58. data/app/helpers/alchemy/admin/essences_helper.rb +1 -1
  59. data/app/helpers/alchemy/admin/ingredients_helper.rb +42 -0
  60. data/app/helpers/alchemy/elements_block_helper.rb +22 -7
  61. data/app/helpers/alchemy/elements_helper.rb +14 -7
  62. data/app/helpers/alchemy/pages_helper.rb +3 -11
  63. data/app/jobs/alchemy/base_job.rb +11 -0
  64. data/app/jobs/alchemy/publish_page_job.rb +11 -0
  65. data/app/models/alchemy/attachment.rb +1 -1
  66. data/app/models/alchemy/content/factory.rb +23 -27
  67. data/app/models/alchemy/content.rb +1 -6
  68. data/app/models/alchemy/element/definitions.rb +29 -27
  69. data/app/models/alchemy/element/element_contents.rb +131 -122
  70. data/app/models/alchemy/element/element_essences.rb +100 -98
  71. data/app/models/alchemy/element/element_ingredients.rb +176 -0
  72. data/app/models/alchemy/element/presenters.rb +89 -87
  73. data/app/models/alchemy/element.rb +40 -73
  74. data/app/models/alchemy/elements_repository.rb +126 -0
  75. data/app/models/alchemy/essence_audio.rb +12 -0
  76. data/app/models/alchemy/essence_headline.rb +40 -0
  77. data/app/models/alchemy/essence_picture.rb +4 -116
  78. data/app/models/alchemy/essence_richtext.rb +12 -0
  79. data/app/models/alchemy/essence_video.rb +12 -0
  80. data/app/models/alchemy/image_cropper_settings.rb +87 -0
  81. data/app/models/alchemy/ingredient.rb +219 -0
  82. data/app/models/alchemy/ingredient_validator.rb +97 -0
  83. data/app/models/alchemy/ingredients/audio.rb +29 -0
  84. data/app/models/alchemy/ingredients/boolean.rb +21 -0
  85. data/app/models/alchemy/ingredients/datetime.rb +20 -0
  86. data/app/models/alchemy/ingredients/file.rb +30 -0
  87. data/app/models/alchemy/ingredients/headline.rb +42 -0
  88. data/app/models/alchemy/ingredients/html.rb +19 -0
  89. data/app/models/alchemy/ingredients/link.rb +16 -0
  90. data/app/models/alchemy/ingredients/node.rb +23 -0
  91. data/app/models/alchemy/ingredients/page.rb +23 -0
  92. data/app/models/alchemy/ingredients/picture.rb +41 -0
  93. data/app/models/alchemy/ingredients/richtext.rb +57 -0
  94. data/app/models/alchemy/ingredients/select.rb +10 -0
  95. data/app/models/alchemy/ingredients/text.rb +17 -0
  96. data/app/models/alchemy/ingredients/video.rb +33 -0
  97. data/app/models/alchemy/language.rb +0 -11
  98. data/app/models/alchemy/node.rb +1 -1
  99. data/app/models/alchemy/page/fixed_attributes.rb +53 -51
  100. data/app/models/alchemy/page/page_elements.rb +186 -205
  101. data/app/models/alchemy/page/page_naming.rb +66 -64
  102. data/app/models/alchemy/page/page_natures.rb +139 -142
  103. data/app/models/alchemy/page/page_scopes.rb +113 -102
  104. data/app/models/alchemy/page/publisher.rb +50 -0
  105. data/app/models/alchemy/page/url_path.rb +1 -1
  106. data/app/models/alchemy/page.rb +69 -42
  107. data/app/models/alchemy/page_version.rb +58 -0
  108. data/app/models/alchemy/picture/calculations.rb +2 -8
  109. data/app/models/alchemy/picture/preprocessor.rb +2 -0
  110. data/app/models/alchemy/picture/transformations.rb +23 -95
  111. data/app/models/alchemy/picture.rb +5 -3
  112. data/app/models/alchemy/picture_variant.rb +1 -3
  113. data/app/models/concerns/alchemy/picture_thumbnails.rb +181 -0
  114. data/app/models/concerns/alchemy/touch_elements.rb +2 -2
  115. data/app/presenters/alchemy/picture_view.rb +88 -0
  116. data/app/serializers/alchemy/element_serializer.rb +5 -0
  117. data/app/serializers/alchemy/page_serializer.rb +1 -7
  118. data/app/serializers/alchemy/page_tree_serializer.rb +6 -5
  119. data/app/services/alchemy/delete_elements.rb +44 -0
  120. data/app/services/alchemy/duplicate_element.rb +56 -0
  121. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +1 -2
  122. data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb +3 -3
  123. data/app/views/alchemy/admin/attachments/assign.js.erb +11 -0
  124. data/app/views/alchemy/admin/crop.html.erb +36 -0
  125. data/app/views/alchemy/admin/elements/_element.html.erb +14 -10
  126. data/app/views/alchemy/admin/elements/{_element_footer.html.erb → _footer.html.erb} +0 -0
  127. data/app/views/alchemy/admin/elements/{_new_element_form.html.erb → _form.html.erb} +1 -1
  128. data/app/views/alchemy/admin/elements/{_element_header.html.erb → _header.html.erb} +1 -1
  129. data/app/views/alchemy/admin/elements/{_element_toolbar.html.erb → _toolbar.html.erb} +5 -6
  130. data/app/views/alchemy/admin/elements/{trash.js.erb → destroy.js.erb} +1 -3
  131. data/app/views/alchemy/admin/elements/new.html.erb +3 -3
  132. data/app/views/alchemy/admin/elements/order.js.erb +0 -17
  133. data/app/views/alchemy/admin/elements/update.js.erb +3 -2
  134. data/app/views/alchemy/admin/essence_audios/edit.html.erb +7 -0
  135. data/app/views/alchemy/admin/essence_pictures/update.js.erb +0 -1
  136. data/app/views/alchemy/admin/essence_videos/edit.html.erb +11 -0
  137. data/app/views/alchemy/admin/ingredients/_audio_fields.html.erb +4 -0
  138. data/app/views/alchemy/admin/ingredients/_file_fields.html.erb +18 -0
  139. data/app/views/alchemy/admin/ingredients/_picture_fields.html.erb +25 -0
  140. data/app/views/alchemy/admin/ingredients/_video_fields.html.erb +8 -0
  141. data/app/views/alchemy/admin/ingredients/edit.html.erb +4 -0
  142. data/app/views/alchemy/admin/layoutpages/edit.html.erb +0 -5
  143. data/app/views/alchemy/admin/nodes/_node.html.erb +2 -2
  144. data/app/views/alchemy/admin/pages/_anchor_link.html.erb +1 -1
  145. data/app/views/alchemy/admin/pages/_external_link.html.erb +1 -1
  146. data/app/views/alchemy/admin/pages/_file_link.html.erb +1 -1
  147. data/app/views/alchemy/admin/pages/_form.html.erb +0 -25
  148. data/app/views/alchemy/admin/pages/_internal_link.html.erb +1 -1
  149. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +5 -16
  150. data/app/views/alchemy/admin/pages/_page.html.erb +133 -111
  151. data/app/views/alchemy/admin/pages/_sitemap.html.erb +16 -10
  152. data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb +5 -2
  153. data/app/views/alchemy/admin/pages/_toolbar.html.erb +12 -0
  154. data/app/views/alchemy/admin/pages/edit.html.erb +37 -25
  155. data/app/views/alchemy/admin/pages/fold.js.erb +2 -0
  156. data/app/views/alchemy/admin/pages/index.html.erb +1 -1
  157. data/app/views/alchemy/admin/pages/sort.html.erb +19 -0
  158. data/app/views/alchemy/admin/pages/update.js.erb +1 -8
  159. data/app/views/alchemy/admin/partials/_remote_search_form.html.erb +2 -4
  160. data/app/views/alchemy/admin/partials/_routes.html.erb +8 -19
  161. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +4 -8
  162. data/app/views/alchemy/admin/pictures/_infos.html.erb +0 -1
  163. data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb +4 -4
  164. data/app/views/alchemy/admin/pictures/assign.js.erb +10 -0
  165. data/app/views/alchemy/admin/resources/_form.html.erb +1 -0
  166. data/app/views/alchemy/essences/_essence_audio_editor.html.erb +4 -0
  167. data/app/views/alchemy/essences/_essence_audio_view.html.erb +15 -0
  168. data/app/views/alchemy/essences/_essence_file_editor.html.erb +15 -6
  169. data/app/views/alchemy/essences/_essence_headline_editor.html.erb +36 -0
  170. data/app/views/alchemy/essences/_essence_headline_view.html.erb +10 -0
  171. data/app/views/alchemy/essences/_essence_link_editor.html.erb +8 -4
  172. data/app/views/alchemy/essences/_essence_node_editor.html.erb +1 -1
  173. data/app/views/alchemy/essences/_essence_page_editor.html.erb +1 -1
  174. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +27 -12
  175. data/app/views/alchemy/essences/_essence_text_editor.html.erb +12 -4
  176. data/app/views/alchemy/essences/_essence_video_editor.html.erb +4 -0
  177. data/app/views/alchemy/essences/_essence_video_view.html.erb +18 -0
  178. data/app/views/alchemy/essences/shared/_essence_picture_tools.html.erb +21 -16
  179. data/app/views/alchemy/essences/shared/_linkable_essence_tools.html.erb +2 -2
  180. data/app/views/alchemy/ingredients/_audio_editor.html.erb +5 -0
  181. data/app/views/alchemy/ingredients/_audio_view.html.erb +14 -0
  182. data/app/views/alchemy/ingredients/_boolean_editor.html.erb +11 -0
  183. data/app/views/alchemy/ingredients/_boolean_view.html.erb +1 -0
  184. data/app/views/alchemy/ingredients/_datetime_editor.html.erb +17 -0
  185. data/app/views/alchemy/ingredients/_datetime_view.html.erb +9 -0
  186. data/app/views/alchemy/ingredients/_file_editor.html.erb +50 -0
  187. data/app/views/alchemy/ingredients/_file_view.html.erb +17 -0
  188. data/app/views/alchemy/ingredients/_headline_editor.html.erb +30 -0
  189. data/app/views/alchemy/ingredients/_headline_view.html.erb +9 -0
  190. data/app/views/alchemy/ingredients/_html_editor.html.erb +8 -0
  191. data/app/views/alchemy/ingredients/_html_view.html.erb +1 -0
  192. data/app/views/alchemy/ingredients/_link_editor.html.erb +24 -0
  193. data/app/views/alchemy/ingredients/_link_view.html.erb +9 -0
  194. data/app/views/alchemy/ingredients/_node_editor.html.erb +25 -0
  195. data/app/views/alchemy/ingredients/_node_view.html.erb +1 -0
  196. data/app/views/alchemy/ingredients/_page_editor.html.erb +24 -0
  197. data/app/views/alchemy/ingredients/_page_view.html.erb +4 -0
  198. data/app/views/alchemy/ingredients/_picture_editor.html.erb +59 -0
  199. data/app/views/alchemy/ingredients/_picture_view.html.erb +5 -0
  200. data/app/views/alchemy/ingredients/_richtext_editor.html.erb +12 -0
  201. data/app/views/alchemy/ingredients/_richtext_view.html.erb +3 -0
  202. data/app/views/alchemy/ingredients/_select_editor.html.erb +29 -0
  203. data/app/views/alchemy/ingredients/_select_view.html.erb +1 -0
  204. data/app/views/alchemy/ingredients/_text_editor.html.erb +19 -0
  205. data/app/views/alchemy/ingredients/_text_view.html.erb +16 -0
  206. data/app/views/alchemy/ingredients/_video_editor.html.erb +5 -0
  207. data/app/views/alchemy/ingredients/_video_view.html.erb +17 -0
  208. data/app/views/alchemy/ingredients/shared/_link_tools.html.erb +20 -0
  209. data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb +57 -0
  210. data/config/alchemy/config.yml +0 -1
  211. data/config/brakeman.ignore +66 -159
  212. data/config/initializers/dragonfly.rb +2 -2
  213. data/config/locales/alchemy.en.yml +26 -15
  214. data/config/routes.rb +19 -26
  215. data/db/migrate/20201207131309_create_page_versions.rb +19 -0
  216. data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb +76 -0
  217. data/db/migrate/20210205143548_rename_public_on_and_public_until_on_alchemy_pages.rb +10 -0
  218. data/db/migrate/20210326105046_add_sanitized_body_to_alchemy_essence_richtexts.rb +7 -0
  219. data/db/migrate/20210406093436_add_alchemy_essence_headlines.rb +12 -0
  220. data/db/migrate/20210506135919_create_essence_audios.rb +19 -0
  221. data/db/migrate/20210506140258_create_essence_videos.rb +23 -0
  222. data/db/migrate/20210508091432_create_alchemy_ingredients.rb +22 -0
  223. data/lib/alchemy/admin/preview_url.rb +2 -0
  224. data/lib/alchemy/deprecation.rb +1 -1
  225. data/lib/alchemy/dragonfly/processors/auto_orient.rb +18 -0
  226. data/lib/alchemy/elements_finder.rb +14 -60
  227. data/lib/alchemy/engine.rb +1 -19
  228. data/lib/alchemy/essence.rb +1 -2
  229. data/lib/alchemy/hints.rb +1 -1
  230. data/lib/alchemy/page_layout.rb +2 -19
  231. data/lib/alchemy/permissions.rb +31 -29
  232. data/lib/alchemy/resource.rb +13 -3
  233. data/lib/alchemy/tasks/tidy.rb +29 -0
  234. data/lib/alchemy/test_support/essence_shared_examples.rb +0 -1
  235. data/lib/alchemy/test_support/factories/element_factory.rb +8 -8
  236. data/lib/alchemy/test_support/factories/essence_audio_factory.rb +7 -0
  237. data/lib/alchemy/test_support/factories/essence_video_factory.rb +7 -0
  238. data/lib/alchemy/test_support/factories/ingredient_factory.rb +25 -0
  239. data/lib/alchemy/test_support/factories/page_factory.rb +20 -1
  240. data/lib/alchemy/test_support/factories/page_version_factory.rb +23 -0
  241. data/lib/alchemy/test_support/having_crop_action_examples.rb +170 -0
  242. data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb +646 -0
  243. data/lib/alchemy/test_support/shared_ingredient_editor_examples.rb +21 -0
  244. data/lib/alchemy/test_support/shared_ingredient_examples.rb +57 -0
  245. data/lib/alchemy/test_support.rb +2 -11
  246. data/lib/alchemy/tinymce.rb +17 -0
  247. data/lib/alchemy/upgrader/five_point_zero.rb +0 -32
  248. data/lib/alchemy/upgrader/six_point_zero.rb +21 -0
  249. data/lib/alchemy/upgrader/tasks/add_page_versions.rb +33 -0
  250. data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb +51 -0
  251. data/lib/alchemy/version.rb +1 -1
  252. data/lib/alchemy_cms.rb +0 -1
  253. data/lib/generators/alchemy/elements/elements_generator.rb +1 -0
  254. data/lib/generators/alchemy/elements/templates/view.html.erb +9 -0
  255. data/lib/generators/alchemy/elements/templates/view.html.haml +9 -0
  256. data/lib/generators/alchemy/elements/templates/view.html.slim +9 -0
  257. data/lib/generators/alchemy/ingredient/ingredient_generator.rb +38 -0
  258. data/lib/generators/alchemy/ingredient/templates/editor.html.erb +14 -0
  259. data/lib/generators/alchemy/ingredient/templates/model.rb.tt +13 -0
  260. data/lib/generators/alchemy/ingredient/templates/view.html.erb +1 -0
  261. data/lib/generators/alchemy/install/install_generator.rb +1 -2
  262. data/lib/generators/alchemy/install/templates/dragonfly.rb.tt +1 -1
  263. data/lib/generators/alchemy/menus/templates/node.html.erb +1 -1
  264. data/lib/generators/alchemy/menus/templates/node.html.haml +1 -1
  265. data/lib/generators/alchemy/menus/templates/node.html.slim +1 -1
  266. data/lib/generators/alchemy/menus/templates/wrapper.html.erb +1 -1
  267. data/lib/generators/alchemy/menus/templates/wrapper.html.haml +1 -1
  268. data/lib/generators/alchemy/menus/templates/wrapper.html.slim +1 -1
  269. data/lib/tasks/alchemy/tidy.rake +12 -0
  270. data/lib/tasks/alchemy/upgrade.rake +21 -15
  271. data/package/admin.js +8 -4
  272. data/package/src/file_editors.js +28 -0
  273. data/package/src/image_cropper.js +103 -0
  274. data/package/src/image_loader.js +58 -0
  275. data/package/src/node_tree.js +8 -8
  276. data/package/src/picture_editors.js +169 -0
  277. data/package/src/utils/__tests__/ajax.spec.js +16 -52
  278. data/package/src/utils/ajax.js +0 -12
  279. data/package.json +3 -2
  280. data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js +3 -18
  281. data/vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js +434 -0
  282. data/vendor/assets/stylesheets/alchemy_admin/select2.scss +1 -1
  283. data/vendor/assets/stylesheets/jquery.Jcrop.min.scss +2 -28
  284. metadata +291 -54
  285. data/.rspec +0 -1
  286. data/app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee +0 -44
  287. data/app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee +0 -30
  288. data/app/assets/javascripts/alchemy/templates/page_folder.hbs +0 -3
  289. data/app/assets/stylesheets/alchemy/trash.scss +0 -8
  290. data/app/controllers/alchemy/admin/trash_controller.rb +0 -44
  291. data/app/views/alchemy/admin/essence_files/assign.js.erb +0 -3
  292. data/app/views/alchemy/admin/essence_pictures/assign.js.erb +0 -4
  293. data/app/views/alchemy/admin/essence_pictures/crop.html.erb +0 -48
  294. data/app/views/alchemy/admin/trash/clear.js.erb +0 -4
  295. data/app/views/alchemy/admin/trash/index.html.erb +0 -31
  296. data/lib/alchemy/dragonfly/processors/thumbnail.rb +0 -27
  297. data/lib/alchemy/error_tracking/airbrake_handler.rb +0 -13
  298. data/lib/alchemy/error_tracking.rb +0 -14
  299. data/lib/alchemy/test_support/factories.rb +0 -20
  300. data/package/src/page_publication_fields.js +0 -27
  301. data/package/src/page_sorter.js +0 -62
  302. data/package/src/sitemap.js +0 -148
@@ -3,27 +3,31 @@
3
3
  module Alchemy
4
4
  module Admin
5
5
  class ElementsController < Alchemy::Admin::BaseController
6
- before_action :load_element, only: [:update, :trash, :fold, :publish]
6
+ before_action :load_element, only: [:update, :destroy, :fold, :publish]
7
7
  authorize_resource class: Alchemy::Element
8
8
 
9
9
  def index
10
- @page = Page.find(params[:page_id])
11
- @elements = @page.all_elements.not_nested.unfixed.not_trashed.includes(*element_includes)
12
- @fixed_elements = @page.all_elements.fixed.not_trashed.includes(*element_includes)
10
+ @page_version = PageVersion.find(params[:page_version_id])
11
+ @page = @page_version.page
12
+ elements = @page_version.elements.order(:position).includes(*element_includes)
13
+ @elements = elements.not_nested.unfixed
14
+ @fixed_elements = elements.not_nested.fixed
13
15
  end
14
16
 
15
17
  def new
16
- @page = Page.find(params[:page_id])
18
+ @page_version = PageVersion.find(params[:page_version_id])
19
+ @page = @page_version.page
17
20
  @parent_element = Element.find_by(id: params[:parent_element_id])
18
21
  @elements = @page.available_elements_within_current_scope(@parent_element)
19
- @element = @page.elements.build
22
+ @element = @page_version.elements.build
20
23
  @clipboard = get_clipboard("elements")
21
24
  @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
22
25
  end
23
26
 
24
27
  # Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
25
28
  def create
26
- @page = Page.find(params[:element][:page_id])
29
+ @page_version = PageVersion.find(params[:element][:page_version_id])
30
+ @page = @page_version.page
27
31
  Element.transaction do
28
32
  if @paste_from_clipboard = params[:paste_from_clipboard].present?
29
33
  @element = paste_element_from_clipboard
@@ -38,7 +42,7 @@ module Alchemy
38
42
  if @element.valid?
39
43
  render :create
40
44
  else
41
- @element.page = @page
45
+ @element.page_version = @page_version
42
46
  @elements = @page.available_element_definitions
43
47
  @clipboard = get_clipboard("elements")
44
48
  @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
@@ -51,40 +55,38 @@ module Alchemy
51
55
  # And update all contents in the elements by calling update_contents.
52
56
  #
53
57
  def update
54
- if @element.update_contents(contents_params)
55
- @page = @element.page
56
- @element_validated = @element.update(element_params)
58
+ @page = @element.page
59
+
60
+ if element_params.key?(:ingredients_attributes)
61
+ update_element_with_ingredients
57
62
  else
58
- @element_validated = false
59
- @notice = Alchemy.t("Validation failed")
60
- @error_message = "<h2>#{@notice}</h2><p>#{Alchemy.t(:content_validations_headline)}</p>".html_safe
63
+ update_element_with_contents
61
64
  end
62
65
  end
63
66
 
64
- def publish
65
- @element.update(public: !@element.public?)
67
+ def destroy
68
+ @element.destroy
69
+ @notice = Alchemy.t("Successfully deleted element") % { element: @element.display_name }
66
70
  end
67
71
 
68
- # Trashes the Element instead of deleting it.
69
- def trash
70
- @page = @element.page
71
- @element.trash!
72
+ def publish
73
+ @element.update(public: !@element.public?)
72
74
  end
73
75
 
74
76
  def order
75
- @trashed_element_ids = Element.trashed.where(id: params[:element_ids]).pluck(:id)
76
77
  @parent_element = Element.find_by(id: params[:parent_element_id])
77
78
  Element.transaction do
78
- params.fetch(:element_ids, []).each_with_index do |element_id, idx|
79
- # Ensure to set page_id and parent_element_id to the current
80
- # because of trashed elements could still have old values
81
- Element.where(id: element_id).update_all(
82
- page_id: params[:page_id],
79
+ params.fetch(:element_ids, []).each.with_index(1) do |element_id, position|
80
+ # We need to set the parent_element_id, because we might have dragged the
81
+ # element over from another nestable element
82
+ Element.find_by(id: element_id).update_columns(
83
83
  parent_element_id: params[:parent_element_id],
84
- position: idx + 1,
84
+ position: position,
85
85
  )
86
86
  end
87
- @parent_element.try!(:touch)
87
+ # Need to manually touch the parent because Rails does not do it
88
+ # with the update_columns above
89
+ @parent_element&.touch
88
90
  end
89
91
  end
90
92
 
@@ -102,6 +104,7 @@ module Alchemy
102
104
  contents: {
103
105
  essence: :ingredient_association,
104
106
  },
107
+ ingredients: :related_object,
105
108
  },
106
109
  :tags,
107
110
  {
@@ -110,6 +113,7 @@ module Alchemy
110
113
  contents: {
111
114
  essence: :ingredient_association,
112
115
  },
116
+ ingredients: :related_object,
113
117
  },
114
118
  :tags,
115
119
  ],
@@ -132,7 +136,7 @@ module Alchemy
132
136
  @source_element = Element.find(element_from_clipboard["id"])
133
137
  element = Element.copy(@source_element, {
134
138
  parent_element_id: create_element_params[:parent_element_id],
135
- page_id: @page.id,
139
+ page_version_id: @page_version.id,
136
140
  })
137
141
  if element_from_clipboard["action"] == "cut"
138
142
  @cut_element_id = @source_element.id
@@ -147,15 +151,35 @@ module Alchemy
147
151
  end
148
152
 
149
153
  def element_params
150
- if @element.taggable?
151
- params.fetch(:element, {}).permit(:tag_list)
154
+ params.fetch(:element, {}).permit(:tag_list, ingredients_attributes: {})
155
+ end
156
+
157
+ def create_element_params
158
+ params.require(:element).permit(:name, :page_version_id, :parent_element_id)
159
+ end
160
+
161
+ def update_element_with_ingredients
162
+ if @element.update(element_params)
163
+ @element_validated = true
152
164
  else
153
- params.fetch(:element, {})
165
+ element_update_error
166
+ @error_messages = @element.ingredient_error_messages
154
167
  end
155
168
  end
156
169
 
157
- def create_element_params
158
- params.require(:element).permit(:name, :page_id, :parent_element_id)
170
+ def update_element_with_contents
171
+ if @element.update_contents(contents_params)
172
+ @element_validated = @element.update(element_params)
173
+ else
174
+ element_update_error
175
+ @error_messages = @element.essence_error_messages
176
+ end
177
+ end
178
+
179
+ def element_update_error
180
+ @element_validated = false
181
+ @notice = Alchemy.t("Validation failed")
182
+ @error_message = "<h2>#{@notice}</h2><p>#{Alchemy.t(:content_validations_headline)}</p>".html_safe
159
183
  end
160
184
  end
161
185
  end
@@ -0,0 +1,30 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Alchemy
4
+ module Admin
5
+ class EssenceAudiosController < Alchemy::Admin::BaseController
6
+ authorize_resource class: Alchemy::EssenceAudio
7
+ before_action :load_essence
8
+
9
+ def update
10
+ @essence_audio.update(essence_audio_params)
11
+ end
12
+
13
+ private
14
+
15
+ def load_essence
16
+ @essence_audio = EssenceAudio.find(params[:id])
17
+ end
18
+
19
+ def essence_audio_params
20
+ params.require(:essence_audio).permit(
21
+ :autoplay,
22
+ :controls,
23
+ :loop,
24
+ :muted,
25
+ :attachment_id
26
+ )
27
+ end
28
+ end
29
+ end
30
+ end
@@ -17,20 +17,6 @@ module Alchemy
17
17
  @essence_file.update(essence_file_params)
18
18
  end
19
19
 
20
- # Assigns file, but does not saves it.
21
- #
22
- # When the user saves the element the content gets updated as well.
23
- #
24
- def assign
25
- @content = Content.find_by(id: params[:content_id])
26
- @attachment = Attachment.find_by(id: params[:attachment_id])
27
- @content.essence.attachment = @attachment
28
-
29
- # We need to update timestamp here because we don't save yet,
30
- # but the cache needs to be get invalid.
31
- @content.touch
32
- end
33
-
34
20
  private
35
21
 
36
22
  def essence_file_params
@@ -3,11 +3,12 @@
3
3
  module Alchemy
4
4
  module Admin
5
5
  class EssencePicturesController < Alchemy::Admin::BaseController
6
- FLOAT_REGEX = /\A\d+(\.\d+)?\z/
6
+ include CropAction
7
+
7
8
  authorize_resource class: Alchemy::EssencePicture
8
9
 
9
- before_action :load_essence_picture, only: [:edit, :crop, :update]
10
- before_action :load_content, only: [:edit, :update, :assign]
10
+ before_action :load_essence_picture, only: [:edit, :update]
11
+ before_action :load_content, only: [:edit, :update]
11
12
 
12
13
  helper "alchemy/admin/contents"
13
14
  helper "alchemy/admin/essences"
@@ -16,94 +17,22 @@ module Alchemy
16
17
  def edit
17
18
  end
18
19
 
19
- def crop
20
- if @picture = @essence_picture.picture
21
- @content = @essence_picture.content
22
- @min_size = sizes_from_essence_or_params
23
- @ratio = ratio_from_size_or_settings
24
- infer_width_or_height_from_ratio
25
-
26
- @default_box = @essence_picture.default_mask(@min_size)
27
- @initial_box = @essence_picture.cropping_mask || @default_box
28
- else
29
- @no_image_notice = Alchemy.t(:no_image_for_cropper_found)
30
- end
31
- end
32
-
33
20
  def update
34
21
  @essence_picture.update(essence_picture_params)
35
22
  end
36
23
 
37
- # Assigns picture, but does not save it.
38
- #
39
- # When the user saves the element the content gets updated as well.
40
- #
41
- def assign
42
- @picture = Picture.find_by(id: params[:picture_id])
43
- @content.essence.picture = @picture
44
- @element = @content.element
45
-
46
- # We need to update timestamp here because we don't save yet,
47
- # but the cache needs to be get invalid.
48
- @content.touch
49
- end
50
-
51
- def destroy
52
- @content = Content.find_by(id: params[:id])
53
- @element = @content.element
54
- @content_id = @content.id
55
- @content.destroy
56
- @essence_pictures = @element.contents.essence_pictures
57
- end
58
-
59
24
  private
60
25
 
61
26
  def load_essence_picture
62
27
  @essence_picture = EssencePicture.find(params[:id])
63
28
  end
64
29
 
65
- def load_content
66
- @content = Content.find(params[:content_id])
30
+ def load_croppable_resource
31
+ @croppable_resource = EssencePicture.find(params[:id])
67
32
  end
68
33
 
69
- # Gets the minimum size of the image to be rendered.
70
- #
71
- # The +render_size+ attribute has preference over the contents +size+ setting.
72
- #
73
- def sizes_from_essence_or_params
74
- if @essence_picture.render_size?
75
- @essence_picture.sizes_from_string(@essence_picture.render_size)
76
- elsif @essence_picture.content.settings[:size]
77
- @essence_picture.sizes_from_string(@essence_picture.content.settings[:size])
78
- else
79
- { width: 0, height: 0 }
80
- end
81
- end
82
-
83
- # Infers the aspect ratio from size or contents settings. If you don't want a fixed
84
- # aspect ratio, don't specify a size or only width or height.
85
- #
86
- def ratio_from_size_or_settings
87
- if @min_size.value?(0) && @essence_picture.content.settings[:fixed_ratio].to_s =~ FLOAT_REGEX
88
- @essence_picture.content.settings[:fixed_ratio].to_f
89
- elsif !@min_size[:width].zero? && !@min_size[:height].zero?
90
- @min_size[:width].to_f / @min_size[:height]
91
- else
92
- false
93
- end
94
- end
95
-
96
- # Infers the minimum width or height
97
- # if the aspect ratio and one dimension is specified.
98
- #
99
- def infer_width_or_height_from_ratio
100
- return unless @ratio
101
-
102
- if @min_size[:height].zero?
103
- @min_size[:height] = (@min_size[:width] / @ratio).to_i
104
- else
105
- @min_size[:width] = (@min_size[:height] * @ratio).to_i
106
- end
34
+ def load_content
35
+ @content = Content.find(params[:content_id])
107
36
  end
108
37
 
109
38
  def essence_picture_params
@@ -0,0 +1,33 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Alchemy
4
+ module Admin
5
+ class EssenceVideosController < Alchemy::Admin::BaseController
6
+ authorize_resource class: Alchemy::EssenceVideo
7
+ before_action :load_essence
8
+
9
+ def update
10
+ @essence_video.update(essence_video_params)
11
+ end
12
+
13
+ private
14
+
15
+ def load_essence
16
+ @essence_video = EssenceVideo.find(params[:id])
17
+ end
18
+
19
+ def essence_video_params
20
+ params.require(:essence_video).permit(
21
+ :width,
22
+ :height,
23
+ :autoplay,
24
+ :controls,
25
+ :loop,
26
+ :muted,
27
+ :preload,
28
+ :attachment_id
29
+ )
30
+ end
31
+ end
32
+ end
33
+ end
@@ -0,0 +1,30 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Alchemy
4
+ module Admin
5
+ class IngredientsController < Alchemy::Admin::BaseController
6
+ load_and_authorize_resource class: Alchemy::Ingredient
7
+
8
+ include CropAction
9
+
10
+ helper "Alchemy::Admin::Ingredients"
11
+
12
+ def edit
13
+ end
14
+
15
+ def update
16
+ @ingredient.update(ingredient_params)
17
+ end
18
+
19
+ private
20
+
21
+ def ingredient_params
22
+ params.require(:ingredient).permit(@ingredient.class.stored_attributes[:data])
23
+ end
24
+
25
+ def load_croppable_resource
26
+ @croppable_resource = @ingredient
27
+ end
28
+ end
29
+ end
30
+ end
@@ -16,7 +16,6 @@ module Alchemy
16
16
 
17
17
  def edit
18
18
  @page = Page.find(params[:id])
19
- @page_layouts = PageLayout.layouts_with_own_for_select(@page.page_layout, @current_language.id, true)
20
19
  end
21
20
  end
22
21
  end
@@ -7,7 +7,7 @@ module Alchemy
7
7
 
8
8
  helper "alchemy/pages"
9
9
 
10
- before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link]
10
+ before_action :load_resource, except: [:index, :flush, :new, :order, :create, :copy_language_tree, :link, :sort]
11
11
 
12
12
  authorize_resource class: Alchemy::Page, except: [:index, :tree]
13
13
 
@@ -21,7 +21,7 @@ module Alchemy
21
21
  except: [:show]
22
22
 
23
23
  before_action :set_root_page,
24
- only: [:index, :show, :order]
24
+ only: [:index, :show, :sort, :order]
25
25
 
26
26
  before_action :run_on_page_layout_callbacks,
27
27
  if: :run_on_page_layout_callbacks?,
@@ -33,6 +33,8 @@ module Alchemy
33
33
 
34
34
  before_action :set_view, only: [:index]
35
35
 
36
+ before_action :set_page_version, only: [:show, :edit]
37
+
36
38
  def index
37
39
  @query = @current_language.pages.contentpages.ransack(search_filter_params[:q])
38
40
 
@@ -118,7 +120,6 @@ module Alchemy
118
120
 
119
121
  # Set page configuration like page names, meta tags and states.
120
122
  def configure
121
- @page_layouts = PageLayout.layouts_with_own_for_select(@page.page_layout, @current_language.id, @page.layoutpage?)
122
123
  end
123
124
 
124
125
  # Updates page
@@ -128,7 +129,6 @@ module Alchemy
128
129
  def update
129
130
  # stores old page_layout value, because unfurtunally rails @page.changes does not work here.
130
131
  @old_page_layout = @page.page_layout
131
- @old_parent_id = @page.parent_id
132
132
  if @page.update(page_params)
133
133
  @notice = Alchemy.t("Page saved", name: @page.name)
134
134
  @while_page_edit = request.referer.include?("edit")
@@ -137,7 +137,7 @@ module Alchemy
137
137
  @tree = serialized_page_tree
138
138
  end
139
139
  else
140
- render :configure
140
+ configure
141
141
  end
142
142
  end
143
143
 
@@ -173,7 +173,9 @@ module Alchemy
173
173
  def fold
174
174
  # @page is fetched via before filter
175
175
  @page.fold!(current_alchemy_user.id, !@page.folded?(current_alchemy_user.id))
176
- render json: serialized_page_tree
176
+ respond_to do |format|
177
+ format.js
178
+ end
177
179
  end
178
180
 
179
181
  # Leaves the page editing mode and unlocks the page for other users
@@ -190,24 +192,12 @@ module Alchemy
190
192
  end
191
193
  end
192
194
 
193
- def visit
194
- @page.unlock!
195
- redirect_to show_page_url(
196
- urlname: @page.urlname,
197
- locale: prefix_locale? ? @page.language_code : nil,
198
- host: @page.site.host == "*" ? request.host : @page.site.host,
199
- )
200
- end
201
-
202
195
  # Sets the page public and updates the published_at attribute that is used as cache_key
203
196
  #
204
197
  def publish
205
198
  # fetching page via before filter
206
199
  @page.publish!
207
200
 
208
- # Send publish notification to all registered publish targets
209
- Alchemy.publish_targets.each { |p| p.perform_later(@page) }
210
-
211
201
  flash[:notice] = Alchemy.t(:page_published, name: @page.name)
212
202
  redirect_back(fallback_location: admin_pages_path)
213
203
  end
@@ -218,6 +208,10 @@ module Alchemy
218
208
  redirect_to admin_pages_path
219
209
  end
220
210
 
211
+ def sort
212
+ @sorting = true
213
+ end
214
+
221
215
  # Receives a JSON object representing a language tree to be ordered
222
216
  # and updates all pages in that language structure to their correct indexes
223
217
  def order
@@ -398,12 +392,14 @@ module Alchemy
398
392
  @page_root = @current_language.root_page
399
393
  end
400
394
 
395
+ def set_page_version
396
+ @page_version = @page.draft_version
397
+ end
398
+
401
399
  def serialized_page_tree
402
- PageTreeSerializer.new(
403
- @page,
404
- ability: current_ability,
405
- user: current_alchemy_user,
406
- )
400
+ PageTreeSerializer.new(@page, ability: current_ability,
401
+ user: current_alchemy_user,
402
+ full: params[:full] == "true")
407
403
  end
408
404
 
409
405
  def load_languages_and_layouts
@@ -9,12 +9,16 @@ module Alchemy
9
9
  helper "alchemy/admin/tags"
10
10
 
11
11
  before_action :load_resource,
12
- only: [:show, :edit, :update, :destroy, :info]
12
+ only: [:show, :edit, :update, :url, :destroy, :info]
13
13
 
14
14
  before_action :set_size, only: [:index, :show, :edit_multiple]
15
15
 
16
16
  authorize_resource class: Alchemy::Picture
17
17
 
18
+ before_action(only: :assign) do
19
+ @picture = Picture.find(params[:id])
20
+ end
21
+
18
22
  def index
19
23
  @query = Picture.ransack(search_filter_params[:q])
20
24
  @pictures = Picture.search_by(
@@ -32,10 +36,21 @@ module Alchemy
32
36
  def show
33
37
  @previous = @picture.previous(params)
34
38
  @next = @picture.next(params)
35
- @assignments = @picture.essence_pictures.joins(content: {element: :page})
39
+ @assignments = @picture.essence_pictures.joins(content: { element: :page })
36
40
  render action: "show"
37
41
  end
38
42
 
43
+ def url
44
+ options = picture_url_params.to_h.symbolize_keys.transform_values! do |value|
45
+ value.in?(%w[true false]) ? value == "true" : value
46
+ end
47
+ render json: {
48
+ url: @picture.url(options),
49
+ alt: @picture.name,
50
+ title: Alchemy.t(:image_name, name: @picture.name),
51
+ }
52
+ end
53
+
39
54
  def create
40
55
  @picture = Picture.new(picture_params)
41
56
  @picture.name = @picture.humanized_name
@@ -125,8 +140,8 @@ module Alchemy
125
140
  end
126
141
  else
127
142
  cookies[:alchemy_pictures_per_page] = params[:per_page] ||
128
- cookies[:alchemy_pictures_per_page] ||
129
- pictures_per_page_for_size
143
+ cookies[:alchemy_pictures_per_page] ||
144
+ pictures_per_page_for_size
130
145
  end
131
146
  end
132
147
 
@@ -158,17 +173,28 @@ module Alchemy
158
173
  def search_filter_params
159
174
  @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:picture_ids]).permit(
160
175
  *common_search_filter_includes + [
161
- :size,
162
- :element_id,
163
- :swap,
164
- :content_id,
165
- ],
176
+ :size,
177
+ :form_field_id,
178
+ ],
166
179
  )
167
180
  end
168
181
 
169
182
  def picture_params
170
183
  params.require(:picture).permit(:image_file, :upload_hash, :name, :tag_list)
171
184
  end
185
+
186
+ def picture_url_params
187
+ params.permit(
188
+ :crop_from,
189
+ :crop_size,
190
+ :crop,
191
+ :flatten,
192
+ :format,
193
+ :quality,
194
+ :size,
195
+ :upsample
196
+ )
197
+ end
172
198
  end
173
199
  end
174
200
  end
@@ -9,18 +9,21 @@ module Alchemy
9
9
  # If you want to only load a specific type of element pass ?named=an_element_name
10
10
  #
11
11
  def index
12
- @elements = Element.not_nested
12
+ if params[:page_id].present?
13
+ @page = Page.find(params[:page_id])
14
+ @elements = @page.elements.not_nested
15
+ else
16
+ @elements = Element.not_nested.joins(:page_version).merge(PageVersion.published)
17
+ end
18
+
13
19
  # Fix for cancancan not able to merge multiple AR scopes for logged in users
14
20
  if cannot? :manage, Alchemy::Element
15
21
  @elements = @elements.accessible_by(current_ability, :index)
16
22
  end
17
- if params[:page_id].present?
18
- @elements = @elements.where(page_id: params[:page_id])
19
- end
20
23
  if params[:named].present?
21
24
  @elements = @elements.named(params[:named])
22
25
  end
23
- @elements = @elements.includes(*element_includes)
26
+ @elements = @elements.includes(*element_includes).order(:position)
24
27
 
25
28
  render json: @elements, adapter: :json, root: "elements"
26
29
  end
@@ -43,6 +46,7 @@ module Alchemy
43
46
  contents: {
44
47
  essence: :ingredient_association,
45
48
  },
49
+ ingredients: :related_object,
46
50
  },
47
51
  :tags,
48
52
  ],
@@ -51,6 +55,7 @@ module Alchemy
51
55
  contents: {
52
56
  essence: :ingredient_association,
53
57
  },
58
+ ingredients: :related_object,
54
59
  },
55
60
  :tags,
56
61
  ]
@@ -8,7 +8,6 @@ module Alchemy
8
8
  def index
9
9
  @nodes = Node.all
10
10
  @nodes = @nodes.includes(:parent)
11
- @nodes = @nodes.where(language_id: params[:language_id]) if params[:language_id]
12
11
  @nodes = @nodes.ransack(params[:filter]).result
13
12
 
14
13
  if params[:page]