ecom_core 1.1.13 → 1.1.14
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/services/ecom/core/menu_service.rb +2 -5
- data/lib/ecom/core/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8b8bc2e6d8400e996f20f351ee949cff29dbbbba72dbb396c2039b51714ac6f7
|
4
|
+
data.tar.gz: f4c58d21264802a0dc6b18a2adf895205a66c33cbbb160e7b677e9e65eae5465
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e3a700353f3e4fc0bf5e7402026c0ae492a51dae4e30c42a21125e0cef713923910add513c1dc37dfd5aefff06de0451e15c8ca6493e6e226903ec389c736b78
|
7
|
+
data.tar.gz: 39c78b1cd0607c49a7c954b96ce87af031067c198ee78ac628f43715604a38b5b665a11d3019d5abfd5a72db8efb386878a91112143140a4b81bc782126b30a6
|
@@ -9,19 +9,16 @@ module Ecom
|
|
9
9
|
SQL
|
10
10
|
menu = Menu.joins(join_sql).where('UR.id IN (?)', role_ids).distinct
|
11
11
|
menu_list = menu.select { |m| m.parent.nil? }.each_with_object([]) do |item, list|
|
12
|
-
list << { id: item.id, label: item.label, icon: item.icon,
|
12
|
+
list << { id: item.id, label: item.label, icon: item.icon, children: [] }
|
13
13
|
end
|
14
14
|
|
15
15
|
menu_list.each do |ml|
|
16
|
-
ml[:
|
16
|
+
ml[:children] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
|
17
17
|
if item.parent_id == ml[:id]
|
18
18
|
list << { id: item.id, label: item.label, icon: item.icon, route: item.route }
|
19
19
|
end
|
20
20
|
end
|
21
21
|
end
|
22
|
-
|
23
|
-
# Remove id key
|
24
|
-
menu_list.map { |ml| ml.delete(:id) }
|
25
22
|
menu_list
|
26
23
|
end
|
27
24
|
end
|
data/lib/ecom/core/version.rb
CHANGED