ecom_core 1.1.10 → 1.1.11
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 +6 -4
- 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: ac844133bce138559e3a84c51b8f617a42cbcfed66935835693e9478230cc682
|
4
|
+
data.tar.gz: 1416a37521f375b4b4432816661fa7f71dc1e9859c4822b4c63dc692bf144f57
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0244a00f0335429ea1810c615ecaa7f4d934f8f2ab0cca46da585c576b4420acd45606cb0f11f6cd060009e292bbc47564f4761a9823f6a2751789f77c50b25d
|
7
|
+
data.tar.gz: e17dc48bf97da94e12e824099e70d3a86f5aa6600fb67507278afba74eae7bdad6c5bade2dcaf2a9cb23936856be98b98a953ed863df776df3ab56e48e07bed8
|
@@ -4,17 +4,19 @@ module Ecom
|
|
4
4
|
def fetch_menu(user)
|
5
5
|
role_ids = user.user_roles.map(&:id)
|
6
6
|
join_sql = <<-SQL
|
7
|
-
|
8
|
-
|
7
|
+
INNER JOIN ecom_core_menus_user_roles MUR ON MUR.menu_id = ecom_core_menus.id
|
8
|
+
INNER JOIN ecom_core_user_roles UR ON MUR.user_role_id = UR.id
|
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, items: [] }
|
13
13
|
end
|
14
14
|
|
15
15
|
menu_list.each do |ml|
|
16
16
|
ml[:items] = menu.reject { |m| m.parent.nil? }.each_with_object([]) do |item, list|
|
17
|
-
|
17
|
+
if item.parent_id == ml[:id]
|
18
|
+
list << { id: item.id, label: item.label, icon: item.icon, routerLink: item.route }
|
19
|
+
end
|
18
20
|
end
|
19
21
|
end
|
20
22
|
menu_list
|
data/lib/ecom/core/version.rb
CHANGED