solara 0.7.1 → 0.7.2
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5f359a3ba4f7f58b06a5c26efa077d45900f5d98952c8ffb85ed80407b5060b5
|
4
|
+
data.tar.gz: 1f9bf9dc53e840e154f7c8ad3474f04cf4423bbd0ee97f201aa751e1a03423d0
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bbf72d63463d30bd732fc79bb254c66aeba2f65773bb488ac697688656b462860c3e1b9b0ac4a0d506ccc7d249dad2cf4130b2e0f7da06d8d1862765f8cf81dc
|
7
|
+
data.tar.gz: 36ddb1dcdbcf3c3c0540ea5c78461083bc5fc98751a94e864cd81278ead26919006b80bd037d2a57d5d9be557a0b7916a829e04420366abb99db7ba6fb4ad905
|
@@ -40,11 +40,13 @@ class TemplateManager
|
|
40
40
|
end
|
41
41
|
|
42
42
|
def templates
|
43
|
-
result = parse_configurations
|
44
|
-
|
45
|
-
|
43
|
+
result = parse_configurations.compact
|
44
|
+
user_defined_items = collect_user_defined_json.compact
|
45
|
+
user_defined_items.each do |user_defined_item|
|
46
|
+
next if result.any? { |r| r[:filename] == user_defined_item[:filename] }
|
47
|
+
result << user_defined_item
|
46
48
|
end
|
47
|
-
result
|
49
|
+
result
|
48
50
|
rescue StandardError => e
|
49
51
|
Solara.logger.error("Failed to generate templates: #{e.message}")
|
50
52
|
[]
|
@@ -71,7 +73,7 @@ class TemplateManager
|
|
71
73
|
[]
|
72
74
|
end
|
73
75
|
|
74
|
-
def
|
76
|
+
def collect_user_defined_json
|
75
77
|
directories = [
|
76
78
|
FilePath.brand_global_json_dir,
|
77
79
|
FilePath.brand_json_dir(@brand_key)
|