alchemy_cms 3.3.2 → 3.3.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/app/models/alchemy/cell.rb +1 -1
- data/app/views/alchemy/essences/_essence_file_view.html.erb +5 -2
- data/lib/alchemy/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4e46cc1ad834f7414c9aa12266eb68ee85ce0040
|
|
4
|
+
data.tar.gz: 4ab3d7090f5c97ac01ee7c0e263950abbb645c48
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 40701894774db2496b239cae14fbdcf8ff1e76f801f417e96711e1f218f7696877fc52fa642b9fadfc72e2ba617c125c156cd0214326e74e66b35a9615c5b3be
|
|
7
|
+
data.tar.gz: d3543e573450058ce283b23e222488e70f58ab5c53433f8dd329f5a489949a3ce956c65cfc98421d15cd6699bdcf6d7612a2620fbdc1c9e7da9f768a6e5c4c37
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## 3.3.3 (2016-08-31)
|
|
4
|
+
|
|
5
|
+
* Fix bug that rendered duplicate nested elements within a cell (#1100)
|
|
6
|
+
* Merge `html_options` in EssenceFile view (#1115)
|
|
7
|
+
|
|
3
8
|
## 3.3.2 (2016-08-02)
|
|
4
9
|
|
|
5
10
|
* Use relative url for page preview frame in order to prevent cross origin errors (#1076)
|
data/app/models/alchemy/cell.rb
CHANGED
|
@@ -28,7 +28,7 @@ module Alchemy
|
|
|
28
28
|
belongs_to :page
|
|
29
29
|
validates_uniqueness_of :name, scope: 'page_id'
|
|
30
30
|
validates_format_of :name, with: /\A[a-z0-9_-]+\z/
|
|
31
|
-
has_many :elements, -> { order(:position) }, dependent: :destroy
|
|
31
|
+
has_many :elements, -> { where(parent_element_id: nil).order(:position) }, dependent: :destroy
|
|
32
32
|
|
|
33
33
|
class << self
|
|
34
34
|
def definitions
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
<%- cache(content) do -%>
|
|
2
2
|
<%- if attachment = content.ingredient -%>
|
|
3
|
+
<%- html_options = local_assigns.fetch(:html_options, {}) -%>
|
|
3
4
|
<%= link_to(
|
|
4
5
|
content.essence.link_text.presence ||
|
|
5
6
|
content.settings_value(:link_text, local_assigns.fetch(:options, {})) ||
|
|
@@ -9,8 +10,10 @@
|
|
|
9
10
|
name: attachment.urlname,
|
|
10
11
|
format: attachment.suffix
|
|
11
12
|
),
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
{
|
|
14
|
+
class: content.essence.css_class.presence,
|
|
15
|
+
title: content.essence.title.presence
|
|
16
|
+
}.merge(html_options)
|
|
14
17
|
) -%>
|
|
15
18
|
<%- end -%>
|
|
16
19
|
<%- end -%>
|
data/lib/alchemy/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: alchemy_cms
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.3.
|
|
4
|
+
version: 3.3.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Thomas von Deyen
|
|
@@ -13,7 +13,7 @@ authors:
|
|
|
13
13
|
autorequire:
|
|
14
14
|
bindir: bin
|
|
15
15
|
cert_chain: []
|
|
16
|
-
date: 2016-08-
|
|
16
|
+
date: 2016-08-31 00:00:00.000000000 Z
|
|
17
17
|
dependencies:
|
|
18
18
|
- !ruby/object:Gem::Dependency
|
|
19
19
|
name: actionpack-page_caching
|