Release 6.15.1 (#11)

* [skip ci] Update project to latest tag spagofat-6.15.1 * Update pom.xml * Update SNAPSHOT version * [maven-release-plugin] prepare release spagofat-6.15.1 * [maven-release-plugin] prepare for next development iteration --------- Co-authored-by: parerworker <[email protected]> Co-authored-by: GitHub Actions <[email protected]>
RegioneER · Sep 16, 2024 · 5ea65bb · 5ea65bb
1 parent 9f28bfe
commit 5ea65bb
Show file tree

Hide file tree

Showing 18 changed files with 42 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 
+## 6.15.1 (12-09-2024)
+
+### Bugfix: 1
+- [#33872](https://parermine.regione.emilia-romagna.it/issues/33872) Correzione recupero informazione organizzazione versante
+
 ## 6.15.0 (19-08-2024)
 
 ### Novità: 1

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,4 +1,4 @@
-## 6.15.0 (19-08-2024)
+## 6.15.1 (12-09-2024)
 
-### Novità: 1
-- [#33050](https://parermine.regione.emilia-romagna.it/issues/33050) Aggiornamento librerie obsolete 2024
+### Bugfix: 1
+- [#33872](https://parermine.regione.emilia-romagna.it/issues/33872) Correzione recupero informazione organizzazione versante
diff --git a/pom.xml b/pom.xml
@@ -1,11 +1,24 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>spagofat</artifactId>
-    <version>6.15.1-SNAPSHOT</version>
+    <version>6.15.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Spagolite</name>
     <description>Framework utilizzato dalle applicazioni web, si tratta di uno strato software comune contenente anche le dipendenze di terze parti ed ereditato come bom.</description>
 
+    <distributionManagement>
+        <repository>
+               <id>github</id>
+               <url>https://maven.pkg.github.com/RegioneER/parer-framework-spagolite</url>
+           </repository>      
+    </distributionManagement>
+
+    <repositories>
+        <repository>
+            <id>github</id>
+            <url>https://maven.pkg.github.com/RegioneER/parer-framework-parerpom</url>            
+       </repository>     
+    </repositories>
 
     <parent>
         <groupId>it.eng.parer</groupId>
@@ -18,19 +31,7 @@
         <tag>HEAD</tag>
     </scm>
 
-    <distributionManagement>
-        <repository>
-               <id>github</id>
-               <url>https://maven.pkg.github.com/RegioneER/parer-framework-spagolite</url>
-           </repository>      
-    </distributionManagement>
 
-    <repositories>
-        <repository>
-            <id>github</id>
-            <url>https://maven.pkg.github.com/RegioneER/parer-framework-parerpom</url>            
-       </repository>     
-	</repositories>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/spagolite-core/pom.xml b/spagolite-core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/spagolite-middle/pom.xml b/spagolite-middle/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>

diff --git a/spagolite-middle/src/main/java/it/eng/spagoLite/tag/MenuTag.java b/spagolite-middle/src/main/java/it/eng/spagoLite/tag/MenuTag.java
@@ -119,10 +119,12 @@ private void drawUserInfo() throws JspException {
                 infoUtente.append("<div><label class=\"slLabel\" >");
                 infoUtente.append(nome + ": ");
                 infoUtente.append("</label>");
-                // Recupero dalla sessione il parametro linkabile da visualizzare nel menu
-                String link = (String) pageContext.getSession().getAttribute(nome + "_LINK");
-                if (link != null) {
-                    infoUtente.append(link);
+                if (nome.equals("STRUTTURA")) {
+                    String linkStrut = "<a href=\"Strutture.html?operation=loadStrutDaMenu\">" + value + "</a>";
+                    infoUtente.append(linkStrut);
+                } else if (nome.equals("VERSATORE")) {
+                    String linkVers = "<a href=\"Amministrazione.html?operation=loadVersDaMenu\">" + value + "</a>";
+                    infoUtente.append(linkVers);
                 } else {
                     infoUtente.append(value);
                 }

diff --git a/spagolite-paginator-ejb/pom.xml b/spagolite-paginator-ejb/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
 
      <dependencyManagement>

diff --git a/spagolite-paginator-gf/pom.xml b/spagolite-paginator-gf/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
 
     <dependencyManagement>

diff --git a/spagolite-si-client/pom.xml b/spagolite-si-client/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/spagolite-si-server/pom.xml b/spagolite-si-server/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
     <packaging>war</packaging>
     <dependencies>

diff --git a/spagolite-si-util/pom.xml b/spagolite-si-util/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
     <build>
         <plugins>

diff --git a/spagolite-sl-ejb/pom.xml b/spagolite-sl-ejb/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/spagolite-sl-jpa/pom.xml b/spagolite-sl-jpa/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/spagolite-sl-slg/pom.xml b/spagolite-sl-slg/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
     <dependencies>
         <dependency>

diff --git a/spagolite-sl-web/pom.xml b/spagolite-sl-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
     <dependencies>
 		<dependency>

diff --git a/spagolite-timer-wrapper-common/pom.xml b/spagolite-timer-wrapper-common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
     <artifactId>spagofat-timer-wrapper-common</artifactId>
     <name>Spagolite Timer wrapper - common</name>

diff --git a/spagolite-timer-wrapper-ejb/pom.xml b/spagolite-timer-wrapper-ejb/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>it.eng.parer</groupId>
         <artifactId>spagofat</artifactId>
-        <version>6.15.1-SNAPSHOT</version>
+        <version>6.15.2-SNAPSHOT</version>
     </parent>
     <artifactId>spagofat-timer-wrapper-ejb</artifactId>
     <name>Spagolite Timer wrapper - ejb</name>

diff --git a/spagolite-webresources/pom.xml b/spagolite-webresources/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>it.eng.parer</groupId>
 		<artifactId>spagofat</artifactId>
-		<version>6.15.1-SNAPSHOT</version>
+		<version>6.15.2-SNAPSHOT</version>
 	</parent>
 	<build>
 		<plugins>