alchemy_cms 5.3.5 → 5.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a2374c679c6d6962c9bb32d48f8f444def421fb927302b87f705a85e9e21d85
-  data.tar.gz: d3a682ccdf288d777e87f145b15121fa51d4008d3992ba39abb16e417e2ca1bb
+  metadata.gz: 9df1280121647518564fa377e3d89b039f1661d0a02dc1cdd695c992e99d19e9
+  data.tar.gz: a53fdd7e2eba3ec9c71a19668e30671308ca0f2d021bdb518114163cd0b742cf
 SHA512:
-  metadata.gz: 1d40a29752e354e66b2186290cb229a2d0b89b77b258258c5488f4b8e6f56ffc7714bd6824e89e05a9075c53a3294c75eb5ebe70148c12d0b3fae84781f70a33
-  data.tar.gz: 1ddecd199116f699e351384bb460c39bb3203a71fa41a3d6e3319b8ad8107500049f1e37894f9a14f3e955930ae98e2dcc2d1458fff128dac2178b9d94cbeabc
+  metadata.gz: 5c6ac637ddf39da330066dca6907715b194298b2f4d07331c33b87615631ac05e41d766a8ce32a4d2ab5764799642a3f90a1e6baad2f78eaca4f861d120372ae
+  data.tar.gz: f669e22a899f8f4f0db6454b987cf9454bf167833f8c5081e9b25d05914b9c18ca2c6f8781a643e1d2934116ac3317fdc31a9372a58b3670fc3bba5463440ad8

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 5.3.8 (2022-09-02)
+
+- Fix author edit_content permissions [#2364](https://github.com/AlchemyCMS/alchemy_cms/pull/2364) ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.3.7 (2022-06-10)
+
+- Fix admin page tree links after update [#2348](https://github.com/AlchemyCMS/alchemy_cms/pull/2348) ([tvdeyen](https://github.com/tvdeyen))
+- Fix initial selection of internal page link select [#2346](https://github.com/AlchemyCMS/alchemy_cms/pull/2346) ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.3.6 (2022-06-04)
+
+- Use HashWithIndifferentAccess for Page definition.  Key hint translation by page_layout [#2343](https://github.com/AlchemyCMS/alchemy_cms/pull/2343) ([dbwinger](https://github.com/dbwinger))
+
 ## 5.3.5 (2022-04-26)
 
 - Add thumbnail processor to support resizing on animated GIFs [#2316](https://github.com/AlchemyCMS/alchemy_cms/pull/2316) ([kulturbande](https://github.com/kulturbande))

data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -87,7 +87,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
         urlname = $element.val()
         $.get Alchemy.routes.api_pages_path,
           q:
-            urlname_eq: urlname.replace(/^\/([a-z]{2}(-[A-Z]{2})?\/)?/, '')
+            urlname_eq: urlname.replace(/^\/([a-z]{2}(-[A-Z]{2})?\/)?(.+?)\/?$/, '$3')
           page: 1
           per_page: 1,
           (data) =>

data/app/assets/stylesheets/alchemy/selects.scss

@@ -42,10 +42,6 @@ select {
       font-weight: normal;
       text-align: left;
 
-      .select2-chosen {
-        overflow: visible;
-      }
-
       .select2-arrow {
         top: 0;
         width: $form-field-height;

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

@@ -8,14 +8,9 @@ module Alchemy
     # Returns all pages as json object
     #
     def index
-      # Fix for cancancan not able to merge multiple AR scopes for logged in users
-      if can? :edit_content, Alchemy::Page
-        @pages = Alchemy::Page.all
-      else
-        language = Alchemy::Language.find_by(id: params[:language_id]) || Alchemy::Language.current
-        @pages = Alchemy::Page.accessible_by(current_ability, :index)
-        @pages = @pages.where(language: language)
-      end
+      language = Alchemy::Language.find_by(id: params[:language_id]) || Alchemy::Language.current
+      @pages = Alchemy::Page.accessible_by(current_ability, :index)
+      @pages = @pages.where(language: language)
       @pages = @pages.includes(*page_includes)
       @pages = @pages.ransack(params[:q]).result
 

data/app/models/alchemy/page.rb

@@ -523,6 +523,12 @@ module Alchemy
       locker.try(:name) || Alchemy.t("unknown")
     end
 
+    # Key hint translations by page layout, rather than the default name.
+    #
+    def hint_translation_attribute
+      page_layout
+    end
+
     # Menus (aka. root nodes) this page is attached to
     #
     def menus

data/app/views/alchemy/admin/pages/update.js.erb

@@ -23,7 +23,7 @@
 <% else -%>
 
   if (page) {
-    var page_html = "<%= j render('page', page: @page) %>";
+    var page_html = "<%= j render('page', page: @page) %>".replace(/__ID__/g, "<%= @page.id %>");;
     var compiler = Handlebars.compile(page_html);
     var tree = <%== @tree.to_json %>;
     page.outerHTML = compiler(tree.pages[0]);

data/lib/alchemy/hints.rb

@@ -37,19 +37,23 @@ module Alchemy
     def hint
       hint = definition["hint"]
       if hint == true
-        Alchemy.t(name, scope: hint_translation_scope)
+        Alchemy.t(hint_translation_attribute, scope: hint_translation_scope)
       else
         hint
       end
     end
 
-    # Returns true if the element has a hint
+    # Returns true if the element has a hint defined
     def has_hint?
-      hint.present?
+      !!definition[:hint]
     end
 
     private
 
+    def hint_translation_attribute
+      name
+    end
+
     def hint_translation_scope
       "#{self.class.model_name.to_s.demodulize.downcase}_hints"
     end

data/lib/alchemy/page_layout.rb

@@ -8,7 +8,7 @@ module Alchemy
       # They are defined in +config/alchemy/page_layout.yml+ file.
       #
       def all
-        @definitions ||= read_definitions_file
+        @definitions ||= read_definitions_file.map(&:with_indifferent_access)
       end
 
       # Add additional page definitions to collection.
@@ -164,7 +164,11 @@ module Alchemy
       #
       def read_definitions_file
         if File.exist?(layouts_file_path)
-          YAML.safe_load(ERB.new(File.read(layouts_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
+          Array.wrap(
+            YAML.safe_load(
+              ERB.new(File.read(layouts_file_path)).result, YAML_WHITELIST_CLASSES, [], true
+          	) || []
+          )
         else
           raise LoadError, "Could not find page_layouts.yml file! Please run `rails generate alchemy:install`"
         end

data/lib/alchemy/permissions.rb

@@ -103,24 +103,26 @@ module Alchemy
         ]
 
         # Controller actions
-        can :leave,                 :alchemy_admin
-        can [:info, :help],         :alchemy_admin_dashboard
-        can :manage,                :alchemy_admin_clipboard
-        can :index,                 :trash
-        can :edit,                  :alchemy_admin_layoutpages
-        can :tree,                  :alchemy_admin_pages
+        can :leave, :alchemy_admin
+        can [:info, :help], :alchemy_admin_dashboard
+        can :manage, :alchemy_admin_clipboard
+        can :index, :trash
+        can :edit, :alchemy_admin_layoutpages
+        can :tree, :alchemy_admin_pages
 
         # Resources
-        can [:read, :download],     Alchemy::Attachment
-        can :manage,                Alchemy::Content
-        can :manage,                Alchemy::Element
-        can :manage,                Alchemy::EssenceFile
-        can :manage,                Alchemy::EssencePicture
-        can :manage,                Alchemy::LegacyPageUrl
-        can :manage,                Alchemy::Node
-        can :read,                  Alchemy::Picture
+        can [:read, :download], Alchemy::Attachment
+        can :manage, Alchemy::Content
+        can :manage, Alchemy::Element
+        can :manage, Alchemy::EssenceFile
+        can :manage, Alchemy::EssencePicture
+        can :manage, Alchemy::LegacyPageUrl
+        can :manage, Alchemy::Node
+        can :read, Alchemy::Picture
         can [:read, :autocomplete], Alchemy::Tag
-        can(:edit_content,          Alchemy::Page) { |p| p.editable_by?(@user) }
+        can :edit_content, Alchemy::Page, Alchemy::Page.all do |page|
+          page.editable_by?(@user)
+        end
       end
     end
 
@@ -169,7 +171,7 @@ module Alchemy
         can :manage, Alchemy::Picture
         can :manage, Alchemy::Attachment
         can :manage, Alchemy::Tag
-        can :index,  Alchemy::Language
+        can :index, Alchemy::Language
       end
     end
 
@@ -184,14 +186,14 @@ module Alchemy
         alchemy_editor_rules
 
         # Navigation
-        can :index,                 [:alchemy_admin_sites, :alchemy_admin_styleguide]
+        can :index, [:alchemy_admin_sites, :alchemy_admin_styleguide]
 
         # Controller actions
         can [:info, :update_check], :alchemy_admin_dashboard
 
         # Resources
-        can :manage,                Alchemy::Language
-        can :manage,                Alchemy::Site
+        can :manage, Alchemy::Language
+        can :manage, Alchemy::Site
       end
     end
 

data/lib/alchemy/version.rb

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

data/package.json

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

data/vendor/assets/stylesheets/alchemy_admin/select2.scss

@@ -64,7 +64,7 @@ html[dir="rtl"] .select2-container .select2-choice {
 }
 
 .select2-container.select2-allowclear .select2-choice .select2-chosen {
-  margin-right: 42px;
+  margin-right: 38px;
 }
 
 .select2-container .select2-choice > .select2-chosen {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.3.5
+  version: 5.3.8
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-26 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1278,7 +1278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails