infopark_fiona7 0.71.1.2 → 0.71.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/fiona7/builder/obj_class_builder.rb +1 -1
- data/lib/fiona7/scrivito_user.rb +8 -9
- data/lib/fiona7/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: afe43c80b818f5ca19c21571d3a98c2568eac684
|
4
|
+
data.tar.gz: aeb258c26d909330c3383d135a5ff989168c6a88
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3f0f1ade46b5928b457534bd07da938c240d809b9de10146eae70d87233e85d3283e5ffc1200e4b6ce0fd957d24dc6b3ff731fdb14ee1fdef6b97096e73f49a2
|
7
|
+
data.tar.gz: 5815edb6514e05026cdb5b88444ece0e223181cb786b1a4740dbf0040e8d2e7607a763aa445f0278941e33e8d92e5f49a86845241448791e82a20d440a4ef6f1
|
@@ -41,7 +41,7 @@ module Fiona7
|
|
41
41
|
cms_attribute = RailsConnector::Attribute.find_by_attribute_name(attribute[:real_name])
|
42
42
|
raw_attribute = Reactor::Cm::Attribute.get(attribute[:real_name].to_s)
|
43
43
|
|
44
|
-
if attribute[:type] == :reference || attribute[:type] == :referencelist
|
44
|
+
if attribute[:type] == :reference || attribute[:type] == :referencelist || attribute[:type] == :link || attribute[:type] == :widgetlist
|
45
45
|
if cms_attribute.attribute_type == "linklist"
|
46
46
|
raw_attribute.set(:helpText, ::ActiveSupport::JSON.encode({type: attribute[:type]}))
|
47
47
|
raw_attribute.save!
|
data/lib/fiona7/scrivito_user.rb
CHANGED
@@ -16,14 +16,6 @@ module Fiona7
|
|
16
16
|
# any write operation
|
17
17
|
user_definition.can_always(:write, :workspace)
|
18
18
|
|
19
|
-
# only root can publish rtc
|
20
|
-
if rsession_user.superuser?
|
21
|
-
user_definition.can_always(:publish, :workspace)
|
22
|
-
else
|
23
|
-
user_definition.can_never(:publish, :workspace)
|
24
|
-
end
|
25
|
-
|
26
|
-
#
|
27
19
|
# Below, we define the publishing restrictions related to 'Obj's for this user.
|
28
20
|
# The restriction callbacks should either return nothing (the 'Obj' may be published),
|
29
21
|
# or a string describing why the 'Obj' cannot be published by this user.
|
@@ -37,9 +29,16 @@ module Fiona7
|
|
37
29
|
if !obj || !obj.permission.release?(rsession_user.user_name)
|
38
30
|
I18n.t(:"fiona7.publish_permission_resticted", path: path)
|
39
31
|
elsif obj && !obj.valid?(:release)
|
40
|
-
obj.errors.join("\n")
|
32
|
+
obj.errors.full_messages.join("\n")
|
41
33
|
end
|
42
34
|
end
|
35
|
+
|
36
|
+
# only root can publish rtc
|
37
|
+
#if rsession_user.superuser?
|
38
|
+
# user_definition.can_always(:publish, :workspace)
|
39
|
+
#else
|
40
|
+
user_definition.can_never(:publish, :workspace)
|
41
|
+
#end
|
43
42
|
end
|
44
43
|
end
|
45
44
|
end
|
data/lib/fiona7/version.rb
CHANGED