alchemy_cms 6.0.8 → 6.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd912f837c7ac9042900c8ec5c75e9cf9a1b48ba65ac3130b6096ae7ce7dbc1b
-  data.tar.gz: 020bdbb64fcf91003f7d4d4ac35290a3160cd0917ebb80b36f9a8c0f42123647
+  metadata.gz: 23531a0233f0633efb7c6c17b3bb79eb6a0fd5536e34766aa76840a43c594c9b
+  data.tar.gz: 3d8a8f2a8266b3fa5982de4009b9703d3ef3b585e1cb35ed2381daedfd110395
 SHA512:
-  metadata.gz: 91764077564dfbd9239073907bf1f0ca0b418c870f91bf26236d6fcefd2074ea55ab38db8be6561ffc07f17fd8c3d3db245b774678125ef0abfa60f08dc9837d
-  data.tar.gz: 4e62bdd3090475ce33be138e827866fa98abe34a9d8c450359fbc7a269ffd92461f0bef5bf7456fca30adb731c44802c8d8489900303afd2e655330850b7f3df
+  metadata.gz: 8ceb3ac0a3f6f833f5c15bfe3bc91d1e42970a03f32c373941d57574405395906fcfa16e373f2cc6db71648a93cfa6e7d37f479dc230f716270aba6539dcc62d
+  data.tar.gz: 02d7428a535cef3b642edec8cdfb2cc7ed77360ea5033de128c2da899d28a24819cbe3026b2dd21a98f280faf505caa76745a103800a0401c5d96f42ae31fcd4

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 6.0.9 (2022-07-25)
+
+- Allow Site managers to remove page locks [#2360](https://github.com/AlchemyCMS/alchemy_cms/pull/2360) ([mamhoff](https://github.com/mamhoff))
+- Add tags to Alchemy::EagerLoading [#2359](https://github.com/AlchemyCMS/alchemy_cms/pull/2359) ([mamhoff](https://github.com/mamhoff))
+- Delete Gutentag Taggings in Alchemy::DeleteElements [#2358](https://github.com/AlchemyCMS/alchemy_cms/pull/2358) ([mamhoff](https://github.com/mamhoff))
+- Fix PictureTransformations#inferred_sizes_from_string [#2356](https://github.com/AlchemyCMS/alchemy_cms/pull/2356) ([mamhoff](https://github.com/mamhoff))
+- add playsinline attribute to ingredient and essence [#2351](https://github.com/AlchemyCMS/alchemy_cms/pull/2351) ([pascalbetz](https://github.com/pascalbetz))
+
 ## 6.0.8 (2022-06-10)
 
 - Fix admin page tree links after update [#2348](https://github.com/AlchemyCMS/alchemy_cms/pull/2348) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -4,15 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 rails_version = ENV.fetch("RAILS_VERSION", 7.0).to_f
-# Necessary until a new 6.1.5 version has been released
-# https://github.com/rails/rails/pull/44691
-if rails_version.to_s.match?(/6.1/)
-  gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
-elsif rails_version.to_s.match?(/7.0/)
-  gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
-else
-  gem "rails", "~> #{rails_version}.0"
-end
+gem "rails", "~> #{rails_version}.0"
 
 if ENV["DB"].nil? || ENV["DB"] == "sqlite"
   gem "sqlite3", "~> 1.4.1"

data/app/controllers/alchemy/admin/essence_videos_controller.rb

@@ -24,6 +24,7 @@ module Alchemy
           :controls,
           :loop,
           :muted,
+          :playsinline,
           :preload,
           :attachment_id
         )

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -145,6 +145,8 @@ module Alchemy
           # Remove page from clipboard
           clipboard = get_clipboard("pages")
           clipboard.delete_if { |item| item["id"] == @page.id.to_s }
+        else
+          flash[:warning] = @page.errors.full_messages.to_sentence
         end
 
         respond_to do |format|

data/app/models/alchemy/eager_loading.rb

@@ -25,6 +25,7 @@ module Alchemy
               elements: [
                 :page,
                 :touchable_pages,
+                :tags,
                 {
                   ingredients: :related_object,
                   contents: :essence,

data/app/models/alchemy/ingredients/video.rb

@@ -12,6 +12,7 @@ module Alchemy
         :height,
         :loop,
         :muted,
+        :playsinline,
         :preload,
         :width
 

data/app/models/alchemy/page.rb

@@ -129,6 +129,11 @@ module Alchemy
     before_create -> { versions.build },
       if: -> { versions.none? }
 
+    before_destroy if: -> { nodes.any? } do
+      errors.add(:nodes, :still_present)
+      throw(:abort)
+    end
+
     before_save :set_language_code,
       if: -> { language.present? }
 

data/app/models/alchemy/picture/transformations.rb

@@ -98,10 +98,10 @@ module Alchemy
       ratio = image_file_width.to_f / image_file_height
 
       if sizes[:width].zero?
-        sizes[:width] = image_file_width * ratio
+        sizes[:width] = (sizes[:height] * ratio).round.to_i
       end
       if sizes[:height].zero?
-        sizes[:height] = image_file_width / ratio
+        sizes[:height] = (sizes[:width] / ratio).round.to_i
       end
 
       sizes

data/app/services/alchemy/delete_elements.rb

@@ -21,6 +21,7 @@ module Alchemy
           class_name.constantize.where(id: ids).delete_all
         end
       contents.delete_all
+      Gutentag::Tagging.where(taggable: elements).delete_all
       delete_elements
     end
 

data/app/views/alchemy/admin/dashboard/_locked_pages.html.erb

@@ -36,7 +36,7 @@
         <% end %>
       </td>
       <td>
-        <% if current_alchemy_user.id == page.locked_by %>
+        <% if (current_alchemy_user.id == page.locked_by) || can?(:manage, Alchemy::Site.current) %>
         <%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) do %>
           <button class="icon_button small" title="<%= Alchemy.t(:explain_unlocking) %>">
             <%= render_icon(:times, size: 'xs') %>

data/app/views/alchemy/admin/essence_videos/edit.html.erb

@@ -5,6 +5,7 @@
   <%= f.input :controls %>
   <%= f.input :loop %>
   <%= f.input :muted %>
+  <%= f.input :playsinline %>
   <%= f.input :preload, collection: %w(auto none metadata),
     include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
   <%= f.submit Alchemy.t(:save) %>

data/app/views/alchemy/admin/ingredients/_video_fields.html.erb

@@ -4,5 +4,6 @@
 <%= f.input :controls, as: :boolean %>
 <%= f.input :loop, as: :boolean %>
 <%= f.input :muted, as: :boolean %>
+<%= f.input :playsinline, as: :boolean %>
 <%= f.input :preload, collection: %w(auto none metadata),
   include_blank: false, input_html: {class: 'alchemy_selectbox'} %>

data/app/views/alchemy/essences/_essence_video_view.html.erb

@@ -5,6 +5,7 @@
     autoplay: content.essence.autoplay,
     loop: content.essence.loop,
     muted: content.essence.muted,
+    playsinline: content.essence.playsinline,
     preload: content.essence.preload.presence,
     width: content.essence.width.presence,
     height: content.essence.height.presence do %>

data/app/views/alchemy/ingredients/_video_view.html.erb

@@ -4,6 +4,7 @@
     autoplay: video_view.autoplay,
     loop: video_view.loop,
     muted: video_view.muted,
+    playsinline: video_view.playsinline,
     preload: video_view.preload.presence,
     width: video_view.width.presence,
     height: video_view.height.presence do %>

data/config/locales/alchemy.en.yml

@@ -777,6 +777,10 @@ en:
           attributes:
             pages:
               still_present: "are still attached to this language. Please remove them first."
+        alchemy/page:
+          attributes:
+            nodes:
+              still_present: "are still attached to this page. Please remove them first."
     models:
       gutentag/tag:
         one: Tag

data/db/migrate/20220514072456_restrict_on_delete_page_id_foreign_key_from_alchemy_nodes.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RestrictOnDeletePageIdForeignKeyFromAlchemyNodes < ActiveRecord::Migration[6.0]
+  def up
+    remove_foreign_key :alchemy_nodes, :alchemy_pages
+    add_foreign_key :alchemy_nodes, :alchemy_pages, column: :page_id, on_delete: :restrict
+  end
+
+  def down
+    remove_foreign_key :alchemy_nodes, :alchemy_pages
+    add_foreign_key :alchemy_nodes, :alchemy_pages, column: :page_id, on_delete: :cascade
+  end
+end

data/db/migrate/20220622130905_add_playsinline_to_alchemy_essence_videos.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddPlaysinlineToAlchemyEssenceVideos < ActiveRecord::Migration[6.0]
+  def change
+    return if column_exists?(:alchemy_essence_videos, :playsinline)
+
+    add_column :alchemy_essence_videos, :playsinline, :boolean, default: false, null: false
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.8"
+  VERSION = "6.0.9"
 
   def self.version
     VERSION

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.8",
+  "version": "6.0.9",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.8
+  version: 6.0.9
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-10 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1293,6 +1293,8 @@ files:
 - db/migrate/20210506135919_create_essence_audios.rb
 - db/migrate/20210506140258_create_essence_videos.rb
 - db/migrate/20210508091432_create_alchemy_ingredients.rb
+- db/migrate/20220514072456_restrict_on_delete_page_id_foreign_key_from_alchemy_nodes.rb
+- db/migrate/20220622130905_add_playsinline_to_alchemy_essence_videos.rb
 - lib/alchemy.rb
 - lib/alchemy/ability_helper.rb
 - lib/alchemy/admin/locale.rb