Revize 1c69708b

re #8025 added ability for admin to see and access all assemblies, added functionality that only visible assemblies load to users

src/main/java/vldc/aswi/dao/AssemblyRepository.java

@@ -35 +35 @@
 
     /**
      * Find assemblies with role, order by order
+     * @param role role of the user
+     * @param isPublic value of the isPublic attribute
      * @return ordered assemblies
      */
-    List<Assembly> getByRolesContainingOrderByAssemblyOrderAsc(Role role);
+    List<Assembly> getByRolesContainingAndIsPublicOrderByAssemblyOrderAsc(Role role, int isPublic);
 }

src/main/java/vldc/aswi/service/AssemblyManagerImpl.java

@@ -83 +83 @@
      */
     @Override
     public List<Assembly> getAssembliesWithRoleOrdered(Role role) {
-        return this.assemblyRepository.getByRolesContainingOrderByAssemblyOrderAsc(role);
+        return this.assemblyRepository.getByRolesContainingAndIsPublicOrderByAssemblyOrderAsc(role, 1);
     }
 
     /**

src/main/java/vldc/aswi/web/controller/AssemblyController.java

@@ -118 +118 @@
 
         Role role = roleManager.getRole(roleName);
 
-        if (!assembly.getRoles().contains(role)) {
+        if (!assembly.getRoles().contains(role) && !role.getName().equals("Administrátor")) {
             // TODO: 04.05.2020 Error page, wrong role
             return new ModelAndView("redirect:/");
         }

src/main/java/vldc/aswi/web/controller/IndexController.java

@@ -71 +71 @@
 
 		Role role = roleManager.getRole(roleName);
 
-		List<Assembly> assemblies = assemblyManager.getAssembliesWithRoleOrdered(role);
+		List<Assembly> assemblies;
+		if (role.getName().equals("Administrátor")) {
+			assemblies = assemblyManager.getAssembliesOrdered();
+		}
+		else {
+			assemblies = assemblyManager.getAssembliesWithRoleOrdered(role);
+		}
 
 		modelMap.addAttribute("assemblies", assemblies);
 		modelMap.addAttribute("attributes", createAttributesString(assemblies));