Merge pull request #323 from consiglionazionaledellericerche/322-cons…

…entire-allamministratore-tecnico-di-vedere-la-lista-persone-e-le-altre-pagine-relative-al-dipendente-del-menu-amministrazione Aggiunta la possibilità per l'amministratore tecnico di poter vedere le pagine relative ai dati dei dipendenti ma senza poterle modificare
consiglionazionaledellericerche · Jan 20, 2025 · ebd6ba9 · ebd6ba9
2 parents 19f2099 + 9f0cb3e
commit ebd6ba9
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.21.4] - Unreleased
+## [2.22.0] - 2025-01-20
 ### Changed
   - Modificato l'algoritmo che carica la lista dei gruppi di codici per i dipendenti
+  - Modificato il novero dei permessi per un amministratore tecnico che ora può anche vedere le info generiche sulle persone 
+    della lista persone
+
 
 ## [2.21.3] - 2025-01-02
 ### Changed

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.21.3
+2.22.0
diff --git a/app/views/Contracts/personContracts.html b/app/views/Contracts/personContracts.html
@@ -128,7 +128,9 @@
 					#{secure.check 'Contracts.split'}
 					#{b.link @Contracts.split(contract.value.id), color:'danger', title:'Split'/}
         			#{/secure.check}
+					#{secure.check 'Contracts.edit'}
         			#{b.link @Contracts.edit(contract.value.id), color:'primary', title:'Gestisci'/}
+					#{/secure.check}
       			#{/b.buttons}
 		</td>
 		<td>#{secure.link @Historicals.contractHistory(contract.value.id, 'CONTRACT'), 'data-async-modal':'#defaultModal'}

diff --git a/app/views/main.html b/app/views/main.html
@@ -82,7 +82,7 @@
             || currentUser?.roles.contains(models.enumerate.AccountRole.DEVELOPER)
             || currentUser?.hasRoles(models.Role.PERSONNEL_ADMIN, models.Role.PERSONNEL_ADMIN_MINI, 
                 models.Role.SEAT_SUPERVISOR, models.Role.MEAL_TICKET_MANAGER,
-                models.Role.REGISTRY_MANAGER) }
+                models.Role.REGISTRY_MANAGER, models.Role.TECHNICAL_ADMIN) }
           #{include './_adminMenu.html' /}
         #{/if}
 

diff --git a/conf/permissions.drl b/conf/permissions.drl
@@ -1449,7 +1449,14 @@ when
 
 		"Administrators.blank",
 		"Administrators.save",
-		"Administrators.delete"
+		"Administrators.delete",
+		"Persons.list",
+		"Persons.edit",
+		"Contracts.personContracts",
+		"Configurations.personShow",
+		"Affiliations.personAffiliations",
+		"BadgeSystems.personBadges"
+
 
         ), target == null, granted == false)
 then
@@ -1543,7 +1550,13 @@ when
   	   "Zones.linkZones",
   	   "Zones.save",
   	   "Zones.saveLinks",
-  	   "Zones.deleteLink"
+  	   "Zones.deleteLink",
+  	   	"Persons.list",
+		"Persons.edit",
+		"Contracts.personContracts",
+		"Configurations.personShow",
+		"Affiliations.personAffiliations",
+		"BadgeSystems.personBadges"
 
        ), target == $o, granted == false)
 then

diff --git a/publiccode.yml b/publiccode.yml
@@ -4,10 +4,10 @@
 
 publiccodeYmlVersion: '0.2'
 name: epas
-releaseDate: '2025-01-02'
+releaseDate: '2025-01-20'
 url: 'https://github.com/consiglionazionaledellericerche/epas'
 applicationSuite: epas
-softwareVersion: 2.21.3
+softwareVersion: 2.22.0
 developmentStatus: stable
 softwareType: standalone/web
 platforms: