From bab825ba289ec99542bc682c9e1d0880e56482e0 Mon Sep 17 00:00:00 2001 From: Balaji <104271023+tbalaji0001@users.noreply.github.com> Date: Thu, 26 Oct 2023 13:30:31 +0530 Subject: [PATCH] Menu Access Control Update --- .DS_Store | Bin 8196 -> 8196 bytes src/.DS_Store | Bin 6148 -> 6148 bytes src/main/.DS_Store | Bin 6148 -> 6148 bytes src/main/java/.DS_Store | Bin 6148 -> 6148 bytes src/main/java/in/.DS_Store | Bin 6148 -> 6148 bytes src/main/java/in/gov/.DS_Store | Bin 6148 -> 6148 bytes .../java/in/gov/chennaicorporation/.DS_Store | Bin 6148 -> 6148 bytes .../chennaicorporation/gccoffice/.DS_Store | Bin 10244 -> 10244 bytes .../gccoffice/controller/MenuController.java | 51 ++---------------- 9 files changed, 3 insertions(+), 48 deletions(-) diff --git a/.DS_Store b/.DS_Store index 2225547008ba82b07a07c15095017690a29ed5e3..9d2110175e3bce55483d4b2f144b86185e7936b1 100644 GIT binary patch delta 30 mcmZp1XmQxUE;6}CRA_Rd;EK(ML|mCSvq^ks+5At0of!bCItsG@ delta 56 zcmZp1XmQxUF2cBda*t>szj$@Ev89QQfS|*H6CDMES{;RI zOA|941q*Z2+FDKyQDuGWp!n>Z+`Rk_1~6b`gwPDUP#Q*cZf0g>VcyKf@sA$>3m6t) delta 116 zcmZoMXffE}%_6)#sURn_xWvHV8Y2@k3o9Et2m9nWmS`^y&UgXw>S|+46CDMES{;RI zLjw~t9R&+>)7n~24pC)&>!A4ToZP(pP6jYwWQ5QRyigiOb!}#1WntdT&heKY03~%6 AlK=n! diff --git a/src/main/.DS_Store b/src/main/.DS_Store index 0408eb3b898306ba63dd8baa6f2183440441f351..bb815401b916f68cde037e406b979077c50faedf 100644 GIT binary patch delta 67 zcmZoMXffE}&BC~CvJXq4s#tZkv4M$>fmxoK@JCx@uAzI9N1c1~_y Xe#hiGHhIR*&CIMU%$wOb{_z6S{xCV;u#9S{;RILj!Zm$r)@Gn^{>InK!d@{N)D# DSWyjK diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store index ee5070d39a38a898c1f29090b33de7f46b14aad4..7f15c6f83591b82e5702ae797ca61253fde663a9 100644 GIT binary patch delta 67 zcmZoMXffE}%*42DvI|q8s#tZkv4M$>fmxoK@JCx@uAzI9N1c1~_y Xe#hk7O!ADKn}0L$ux@7K_{R?bl{*wE delta 68 zcmZoMXffE}%*42TvI|q8ns{}!p}Db+ffmxoK@JCx@uAzI9N1c1~_y Xe#hkdO!ADKoBuO$ux@7K_{R?bms=Dy delta 68 zcmZoMXffE}&cwKVvIkS4ns{}!p}Db+ffmxoK@JCx@uAzI9N1c1~_y be#c~KW_iZW$pK6no0FNBuxw`I_{R?b_3;$< delta 72 zcmZoMXffE(%*42Tatl+Tns{}!p}Db+f`tm#}PR=lIJH00<2gEC2ui diff --git a/src/main/java/in/gov/chennaicorporation/.DS_Store b/src/main/java/in/gov/chennaicorporation/.DS_Store index ea1be54dd3429fbdc39778bab283c0b24394c564..fb1ecce2028c7c5bfec5a6034f8c8df042c7ac10 100644 GIT binary patch delta 71 zcmZoMXffCj&&0TGaspGKs#tZkv4M$>fmxoK@JCx@uAzI9N1c1~_y be#hkRO!ADKlkJ$qHtRCqV%f~b@sA$>@;en~ delta 57 zcmZoMXffCj&&0TWaspGKpm=q)p}Db+fh3V-nk} N!+eWnGdss$egOV(5uyM9 diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/.DS_Store b/src/main/java/in/gov/chennaicorporation/gccoffice/.DS_Store index 04b141dcb1363e506d72c8590a395a6a356d2176..339c739a408eaca31abbc8df377ea2c8a3c7c70b 100644 GIT binary patch delta 72 zcmZn(XbISGN|15eOV delta 25 hcmZn(XbISGN^tT|(cPO{gqnCavn%{!*(A!$3;>m>3Jm}N diff --git a/src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java b/src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java index 5c14e64..a8c9a50 100644 --- a/src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java +++ b/src/main/java/in/gov/chennaicorporation/gccoffice/controller/MenuController.java @@ -50,12 +50,7 @@ public class MenuController { this.menuItemAccessRepository = menuItemAccessRepository; this.subMenuItemAccessRepository = subMenuItemAccessRepository; } - /* - @ModelAttribute("menuItems") // This will add the mßenuItems to the model for all requests - public List getMenuItems() { - return menuItemRepository.findAll(); - } - */ + @ModelAttribute("menuItemsHTML") // This will add the menuItems to the model for all requests public String menuHTML() { @@ -63,11 +58,10 @@ public class MenuController { return ""; } - //System.out.println("MenuController: ID: " + LoginUserInfo.getUserGroupId()); + List getAppModuleAccessEntities; List getAppModuleEntities; if(LoginUserInfo.getUserRole().equals("ADMIN")) { - //getAppModuleAccessEntities = appModuleAccessRepository.findAll(); getAppModuleEntities = appModuleRepository.showAll(); } else { @@ -81,49 +75,10 @@ public class MenuController { } getAppModuleEntities = appModuleRepository.showAllById(checkModuleId); } - //System.out.println(LoginUserInfo.getUserRole()); - - - - - // Create a set to store module IDs to be excluded - //Set includeModuleIds = new HashSet<>(); - - /* - // Populate the set with module IDs to be excluded - for (AppModuleAccessEntity accessEntity : getAppModuleAccessEntities) { - includeModuleIds.add(accessEntity.getModuleId()); - } - - // Convert the set of module IDs to a comma-separated string - StringBuilder moduleIdsBuilder = new StringBuilder(); - for (AppModuleEntity moduleId : includeModuleIds) { - moduleIdsBuilder.append(moduleId.getId()).append(","); - } - */ - // Convert the set of module IDs to a comma-separated string - - - //StringBuilder moduleIdsBuilder = new StringBuilder(); - - /* - for(i=0;i 0 ? moduleIdsBuilder.substring(0, moduleIdsBuilder.length() - 1) : ""; - - - //System.out.println("Module IDs:"+moduleIds); - - - //System.out.println("IModule Size:"+getAppModuleEntities.size()); String menuHTML = ""; for (AppModuleEntity moduleName : getAppModuleEntities) { - //System.out.println("IN Module IDs:"+moduleName.getId()); + menuHTML = menuHTML+"
"+moduleName.getName()+"
"; List getMenuItems;