alchemy_cms 7.0.0.pre.c → 7.0.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d9b2124fdbd7438389b1120a0df30d6ce57a1f353a9ccdae2c59f634b7a60de
-  data.tar.gz: ae2985754c1cb922c8ab9c8b3e510ed13d5139c3b96102346b36710a18f2db5e
+  metadata.gz: cf26638792221ec3a204abb8ca19d221b16f6548d6d4a4d0cb01434962c90814
+  data.tar.gz: b7ad6adcb58b64e1355fd47d70d7622de73f2fc4016db83b06ffb2631c4fc837
 SHA512:
-  metadata.gz: 8a8965055910fe95085ec5c3ed24ca588d8ab6978463ab4445d762dc1cdcb440f7f6830eb13c09e63d8cbac8fef106f0423ee7689d3bc8f0194fd9e9d474c14a
-  data.tar.gz: f570c09d5423ef778c099c5467e7d0d21d0aab5e027581ad1644f3a3c261633a415b50a47605eed83c702d50d3962a16c6e37d8e2f63a319d2b4f43fbe6421a3
+  metadata.gz: ca9665f36097d622e848dc13a5eda0cdc9061e0ac07a319fca261ecfd8572a6c47d9d0ece22672012935e4a83c66768bdd86509ffe05e61e647806a98ed133a4
+  data.tar.gz: 85740399b154064e2070e87779abc09c2c44e08bb0b0bb119b12962bc038bd6375ca4d962951b32b3369ac535bf4f83aa714d5605ddbfbaf3e8faf46cb42e8fd

data/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## 7.0.0 (unreleased)
 
+- Allow to create element with warning in definition [#2507](https://github.com/AlchemyCMS/alchemy_cms/pull/2507) ([tvdeyen](https://github.com/tvdeyen))
+- Remove unused javascript [#2506](https://github.com/AlchemyCMS/alchemy_cms/pull/2506) ([sascha-karnatz](https://github.com/sascha-karnatz))
+- Allow authors to link to all pages again [#2504](https://github.com/AlchemyCMS/alchemy_cms/pull/2504) ([tvdeyen](https://github.com/tvdeyen))
 - Lint JS code with Prettier [#2503](https://github.com/AlchemyCMS/alchemy_cms/pull/2503) ([tvdeyen](https://github.com/tvdeyen))
 - Use absolute imports in modules [#2502](https://github.com/AlchemyCMS/alchemy_cms/pull/2502) ([tvdeyen](https://github.com/tvdeyen))
 - Replace turbolinks with turbo [#2499](https://github.com/AlchemyCMS/alchemy_cms/pull/2499) ([sascha-karnatz](https://github.com/sascha-karnatz))

data/app/assets/javascripts/alchemy/admin.js

@@ -16,7 +16,6 @@
 //= require alchemy/templates
 //= require alchemy/alchemy.base
 //= require alchemy/alchemy.autocomplete
-//= require alchemy/alchemy.browser
 //= require alchemy/alchemy.buttons
 //= require alchemy/alchemy.dialog
 //= require alchemy/alchemy.char_counter

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

@@ -50,25 +50,4 @@ $.extend Alchemy,
       dropdownAutoWidth: true
     return
 
-  getUrlParam: (name) ->
-    results = new RegExp("[\\?&]" + name + "=([^&#]*)").exec(window.location.href)
-    results[1] or 0  if results
-    return
-
-  isiPhone: navigator.userAgent.match(/iPhone/i) isnt null
-  isiPad: navigator.userAgent.match(/iPad/i) isnt null
-  isiPod: navigator.userAgent.match(/iPod/i) isnt null
-  isiOS: navigator.userAgent.match(/iPad|iPhone|iPod/i) isnt null
-  isFirefox: navigator.userAgent.match(/Firefox/i) isnt null
-  isChrome: navigator.userAgent.match(/Chrome/i) isnt null
-  isSafari: navigator.userAgent.match(/Safari/i) isnt null
-  isIE: navigator.userAgent.match(/MSIE/i) isnt null
-
-Alchemy.getBrowserVersion = (browser) ->
-  (if Alchemy["is" + browser] then parseInt(navigator.userAgent.match(new RegExp(browser + ".[0-9]+", "i"))[0].replace(new RegExp(browser + "."), ""), 10) else null)
-  return
 
-Alchemy.ChromeVersion = Alchemy.getBrowserVersion("Chrome")
-Alchemy.FirefoxVersion = Alchemy.getBrowserVersion("Firefox")
-Alchemy.SafariVersion = Alchemy.getBrowserVersion("Safari")
-Alchemy.IEVersion = Alchemy.getBrowserVersion("MSIE")

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

@@ -59,17 +59,12 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
   initPageSelect: ->
     pageTemplate = HandlebarsTemplates.page
     element_anchor_placeholder = @$element_anchor.attr('placeholder')
-    if @link_object.dataset.languageId
-      api_url = "#{Alchemy.routes.api_pages_path}?language_id=#{@link_object.dataset.languageId}"
-    else
-      api_url = Alchemy.routes.api_pages_path
-
     @$internal_link.select2
       placeholder: Alchemy.t('Search page')
       allowClear: true
       minimumInputLength: 3
       ajax:
-        url: api_url
+        url: Alchemy.routes.api_pages_path
         datatype: 'json'
         quietMillis: 300
         data: (term, page) ->

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

@@ -8,9 +8,7 @@ module Alchemy
     # Returns all pages as json object
     #
     def index
-      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/element.rb

@@ -35,13 +35,14 @@ module Alchemy
     FORBIDDEN_DEFINITION_ATTRIBUTES = [
       "amount",
       "autogenerate",
-      "nestable_elements",
+      "compact",
+      "deprecated",
       "hint",
       "ingredients",
-      "taggable",
-      "compact",
       "message",
-      "deprecated"
+      "nestable_elements",
+      "taggable",
+      "warning"
     ].freeze
 
     # All Elements that share the same page version and parent element and are fixed or not are considered a list.

data/app/views/alchemy/ingredients/shared/_link_tools.html.erb

@@ -5,7 +5,6 @@
     onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
     class: "icon_button#{ingredient_editor.linked? ? ' linked' : ''} link-ingredient",
     "data-parent-selector": "[data-ingredient-id='#{ingredient_editor.id}']",
-    "data-language-id": ingredient_editor.page&.language_id,
     title: Alchemy.t(:place_link),
     id: "edit_link_#{ingredient_editor.id}"
   ) %>

data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb

@@ -34,7 +34,6 @@
   class: picture_editor.linked? ? "linked" : nil,
   title: Alchemy.t(:link_image),
   "data-parent-selector": "[data-ingredient-id='#{picture_editor.id}']",
-  "data-language-id": picture_editor.page&.language_id,
   id: "edit_link_#{picture_editor.id}"
 } do %>
   <span class="disabled" tabindex="-1"><%= render_icon(:link) %></span>

data/lib/alchemy/permissions.rb

@@ -41,8 +41,8 @@ module Alchemy
           e.public? && !e.restricted?
         end
 
-        can :read, Alchemy::Page, Alchemy::Page.published.not_restricted do |p|
-          p.public? && !p.restricted?
+        can :read, Alchemy::Page, Alchemy::Page.published.not_restricted.from_current_site do |p|
+          p.public? && !p.restricted? && p.site == Alchemy::Site.current
         end
       end
     end
@@ -64,8 +64,8 @@ module Alchemy
           e.public?
         end
 
-        can :read, Alchemy::Page, Alchemy::Page.published do |p|
-          p.public?
+        can :read, Alchemy::Page, Alchemy::Page.published.from_current_site do |p|
+          p.public? && p.site == Alchemy::Site.current
         end
       end
     end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.0.0-c"
+  VERSION = "7.0.0-rc1"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.0.0.pre.c
+  version: 7.0.0.pre.rc1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -756,7 +756,6 @@ files:
 - app/assets/javascripts/alchemy/admin.js
 - app/assets/javascripts/alchemy/alchemy.autocomplete.js.coffee
 - app/assets/javascripts/alchemy/alchemy.base.js.coffee
-- app/assets/javascripts/alchemy/alchemy.browser.js.coffee
 - app/assets/javascripts/alchemy/alchemy.buttons.js.coffee
 - app/assets/javascripts/alchemy/alchemy.char_counter.js.coffee
 - app/assets/javascripts/alchemy/alchemy.confirm_dialog.js.coffee
@@ -770,7 +769,6 @@ files:
 - app/assets/javascripts/alchemy/alchemy.growler.js.coffee
 - app/assets/javascripts/alchemy/alchemy.gui.js.coffee
 - app/assets/javascripts/alchemy/alchemy.hotkeys.js.coffee
-- app/assets/javascripts/alchemy/alchemy.html5.js
 - app/assets/javascripts/alchemy/alchemy.image_overlay.coffee
 - app/assets/javascripts/alchemy/alchemy.initializer.js.coffee
 - app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

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

@@ -1,22 +0,0 @@
-window.Alchemy = {} if typeof(Alchemy) is "undefined"
-
-Alchemy.Browser =
-  isiPhone: navigator.userAgent.match(/iPhone/i) isnt null
-  isiPad: navigator.userAgent.match(/iPad/i) isnt null
-  isiPod: navigator.userAgent.match(/iPod/i) isnt null
-  isiOS: navigator.userAgent.match(/iPad|iPhone|iPod/i) isnt null
-  isFirefox: navigator.userAgent.match(/Firefox/i) isnt null
-  isChrome: navigator.userAgent.match(/Chrome/i) isnt null
-  isSafari: navigator.userAgent.match(/AppleWebKit/) and not navigator.userAgent.match(/Chrome/)
-  isIE: navigator.userAgent.match(/MSIE/i) isnt null
-  getVersion: (browser) ->
-    if Alchemy.Browser["is" + browser]
-      parseInt(navigator.userAgent.match(new RegExp(browser + ".[0-9]+", "i"))[0].replace(new RegExp(browser + "."), ""), 10)
-    else
-      null
-
-Alchemy.Browser.ChromeVersion = Alchemy.Browser.getVersion("Chrome")
-Alchemy.Browser.FirefoxVersion = Alchemy.Browser.getVersion("Firefox")
-Alchemy.Browser.SafariVersion = Alchemy.Browser.getVersion("Safari")
-Alchemy.Browser.IEVersion = Alchemy.Browser.getVersion("MSIE")
-Alchemy.Browser.isWebKit = Alchemy.Browser.isChrome || Alchemy.Browser.isSafari

data/app/assets/javascripts/alchemy/alchemy.html5.js

@@ -1,22 +0,0 @@
-// Testing for HTML5 features
-if (typeof(Alchemy) === 'undefined') {
-  var Alchemy = {};
-}
-
-Alchemy.HTML5 = {};
-
-Alchemy.HTML5.hasUploadSupport = function() {
-  return typeof(window.FileReader) !== 'undefined' && supportFileAPI() && supportAjaxUploadProgressEvents();
-
-  function supportFileAPI() {
-    var fi = document.createElement('INPUT');
-    fi.type = 'file';
-    return 'files' in fi;
-  }
-
-  function supportAjaxUploadProgressEvents() {
-    var xhr = new XMLHttpRequest();
-    return !!(xhr && ('upload' in xhr) && ('onprogress' in xhr.upload));
-  }
-
-};