alchemy_cms 8.3.6 → 8.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e13db27417e434306c2ba48c7b3718758690ca49b7cc0ad85aea8921210779e6
-  data.tar.gz: 2a13089265941fac886d3523485414f4cf774d0150382926a0a7131d421f0296
+  metadata.gz: c8f639a1d9089eea972ddfa6d299a072337dfe342441fddd6150cd2dfae8e47f
+  data.tar.gz: dcc66f199295ff7bffbe07e5e2c28f98e3867675066faa87a6142d745425bf5a
 SHA512:
-  metadata.gz: 4aa7ac27020b95dea3b8ea39a039a0186c5d62d12461f2a6af14d1ff3122fb74fbf33f6e44313345e2d04c8b5b3c8c668658cc7beacf34cf35cdd0af63539280
-  data.tar.gz: b301ea1b3dfc42b213fc6af56f08feabec797d6ffe8354614a8465ec653b436065fd292183593bb71bbccb9225207c64e8608239602cc23929e1d3ba3653280d
+  metadata.gz: 65edc33be6840411cefa89b7a01e99f9d63d556b80c7e3b51f8efe40eac5d75fb6fc9ed7622c9af74161ac80719834e1128dfb7e312e85db5cc0a1254a0f5bd1
+  data.tar.gz: 00254aaacad56b9fd1cd0ac085d676bb3907f4c69f73a0590ab6c0e1b43ae0f7ae0b59c83e84b953131e65a1937da917cbccecd14ec6447af3080921bd1a54fa

data/app/components/alchemy/admin/resource/action.rb

@@ -10,6 +10,8 @@ module Alchemy
       #   name of an action to evaluate if the user can perform these action on the given object
       # @param [String, nil] :tooltip
       #   show a tooltip around the button
+      # @param [Object, nil] :resource
+      #   the resource of the row the action belongs to
       # @param [Lambda] :block
       #   a block to include a button or a link
       #
@@ -30,15 +32,11 @@ module Alchemy
           <% end %>
         ERB
 
-        def initialize(name = nil, tooltip = nil, &block)
+        def initialize(name = nil, tooltip = nil, resource = nil, &block)
           @name = name
           @tooltip = tooltip
-          @block = block
-        end
-
-        def with_resource(resource)
           @resource = resource
-          self
+          @block = block
         end
       end
     end

data/app/components/alchemy/admin/resource/cell.rb

@@ -7,6 +7,8 @@ module Alchemy
       #
       # @param [String, nil] :css_classes
       #   css classes that are show at the table cell
+      # @param [Object, nil] :resource
+      #   the resource of the row the cell belongs to
       # @param [Lambda] :block
       #   a block to include a button or a link
       #
@@ -19,14 +21,10 @@ module Alchemy
           </td>
         ERB
 
-        def initialize(css_classes, &block)
+        def initialize(css_classes, resource = nil, &block)
           @css_classes = css_classes
-          @block = block
-        end
-
-        def with_resource(resource)
           @resource = resource
-          self
+          @block = block
         end
       end
     end

data/app/components/alchemy/admin/resource/table.rb

@@ -69,12 +69,12 @@ module Alchemy
                 <% collection.each do |resource| %>
                   <tr class="<%= cycle('even', 'odd') %>">
                     <% cells.each do |cell| %>
-                       <%= render cell.with_resource(resource) %>
+                       <%= render cell_for(cell, resource) %>
                     <% end %>
                     <% if actions? %>
                       <td class="tools">
                         <% actions.each do |action| %>
-                          <%= render action.with_resource(resource) %>
+                          <%= render action_for(action, resource) %>
                         <% end %>
                       </td>
                     <% end %>
@@ -134,6 +134,18 @@ module Alchemy
 
         private
 
+        # A fresh cell instance is built for every resource because ViewComponent
+        # instances are single-use and may not be rendered more than once.
+        def cell_for(cell, resource)
+          Cell.new(cell.css_classes, resource, &cell.block)
+        end
+
+        # A fresh action instance is built for every resource because ViewComponent
+        # instances are single-use and may not be rendered more than once.
+        def action_for(action, resource)
+          Action.new(action.name, action.tooltip, resource, &action.block)
+        end
+
         ##
         # if no cells are available the resource_helper will be used, to generate the
         # default attributes of the given resource

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

@@ -10,9 +10,11 @@ module Alchemy
       include Alchemy::Admin::PreviewTime
 
       before_action :load_element, only: [:update, :destroy, :collapse, :expand, :publish]
-      authorize_resource class: Alchemy::Element
+      authorize_resource class: Alchemy::Element, except: [:index]
 
       def index
+        authorize! :edit_content, @page
+
         preloaded = Alchemy::ElementPreloader
           .new(page_version: @page_version)
           .call

data/app/views/alchemy/_menubar.html.erb

@@ -17,7 +17,7 @@
           box-shadow: 0 0 0 1px #fff;
           box-sizing: border-box;
           border-bottom-right-radius: var(--border-radius);
-          padding: 12px 16px 12px;
+          padding: 12px 16px 12px 12px;
           gap: 12px;
           justify-content: space-between;
           align-items: center;
@@ -26,6 +26,7 @@
           font-family: "Open Sans", "Lucida Grande", "Lucida Sans Unicode",
             "Lucida Sans", Verdana, Tahoma, sans-serif;
           font-size: 13px;
+          line-height: normal;
         }
 
         .menubar * {
@@ -107,7 +108,7 @@
           <% end %>
         <% end %>
         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 30">
-          <path fill="#fff" d="M15.7 7.9L9.9 2.2 2.1 4.3 0 12.1l5.7 5.8 7.8-2.1 2.2-7.9zm-5.3 10.3l-1.2 4.4 3.2 3.2 4.4-1.2 1.2-4.4-3.2-3.2-4.4 1.2zM23.5 7.3L17.2 9l-1.7 6.2 4.5 4.6 6.2-1.7 1.7-6.2-4.4-4.6z"/>
+          <path fill="#fff" d="M15.7 7.9L9.9 2.2 2.1 4.3 0 12.1l5.7 5.8 7.8-2.1 2.2-7.9zm-5.3 10.3l-1.2 4.4 3.2 3.2 4.4-1.2 1.2-4.4-3.2-3.2-4.4 1.2zM23.5 7.3L17.2 9l-1.7 6.2 4.5 4.6 6.2-1.7 1.7-6.2-4.4-4.6z" />
         </svg>
       </div>
     </template>

data/lib/alchemy/seeder.rb

@@ -111,7 +111,6 @@ module Alchemy
       def create_page(draft, attributes = {})
         children = draft.delete("children") || []
         page = Alchemy::Page.new(draft.merge(attributes))
-        page.versions.build
         page.save!
         log "Created page: #{page.name}"
         children.each do |child|

data/lib/alchemy/version.rb

@@ -3,7 +3,7 @@
 module Alchemy
   extend self
 
-  VERSION = "8.3.6"
+  VERSION = "8.3.7"
 
   def version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.3.6
+  version: 8.3.7
 platform: ruby
 authors:
 - Thomas von Deyen