MGR-133

appNG · Jan 14, 2022 · 4277597 · 4277597
1 parent 6841a8e
commit 4277597
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/application-home/conf/events/ev-repositories.xml b/application-home/conf/events/ev-repositories.xml
@@ -15,7 +15,7 @@
 				<param name="form_action" />
 			</params>
 		</config>
-		<condition expression="${form_action eq 'uploadArchive'}" />
+		<condition expression="${form_action eq 'uploadArchive' and not empty repositoryid}" />
 		<datasource id="archive">
 			<params>
 				<param name="repositoryid">${repositoryid}</param>
@@ -38,7 +38,7 @@
 				<param name="form_action" />
 			</params>
 		</config>
-		<condition expression="${form_action eq 'update'}" />
+		<condition expression="${form_action eq 'update' and not empty repositoryid}" />
 		<datasource id="repository">
 			<params>
 				<param name="repositoryid">${repositoryid}</param>
@@ -78,7 +78,7 @@
 				<param name="form_action" />
 			</params>
 		</config>
-		<condition expression="${form_action eq 'delete-repository'}" />
+		<condition expression="${form_action eq 'delete-repository' and not empty repositoryid}" />
 		<bean id="repositories">
 			<option name="repository" id="${repositoryid}" />
 			<option name="action" id="delete" />
@@ -117,7 +117,7 @@
 				<param name="timestamp" />
 			</params>
 		</config>
-		<condition expression="${form_action eq 'install'}" />
+		<condition expression="${form_action eq 'install' and not empty repositoryid and not empty name and not empty version and not empty timestamp}" />
 		<bean id="installation">
 			<option name="repository" id="${repositoryid}" />
 			<option name="package" packageName="${name}" packageVersion="${version}" packageTimestamp="${timestamp}" />
@@ -139,7 +139,7 @@
 				<param name="timestamp" />
 			</params>
 		</config>
-		<condition expression="${form_action eq 'delete-package'}" />
+		<condition expression="${form_action eq 'delete-package' and not empty repositoryid and not empty name and not empty version and not empty timestamp}" />
 		<bean id="installation">
 			<option name="repository" id="${repositoryid}" />
 			<option name="package" packageName="${name}" packageVersion="${version}" packageTimestamp="${timestamp}" />

diff --git a/application-home/conf/pages/pg-repositories.xml b/application-home/conf/pages/pg-repositories.xml
@@ -102,7 +102,7 @@
 							<param name="version">${packageversion}</param>
 							<param name="timestamp">${packagetimestamp}</param>
 						</params>
-						<condition expression="${not empty form_action and not empty id}" />
+						<condition expression="${not empty act and not empty id and not empty packagename and not empty packageversion and not empty packagetimestamp}" />
 					</action>
 				</element>
 			</section>
@@ -115,7 +115,7 @@
 							<param name="repositoryid">${id}</param>
 							<param name="form_action">${act}</param>
 						</params>
-						<condition expression="${form_action eq 'reload' and not empty repositoryid}" />
+						<condition expression="${act eq 'reload' and not empty id}" />
 					</action>
 				</element>
 			</section>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<artifactId>appng-manager</artifactId>
 	<packaging>jar</packaging>
 	<name>appNG Manager</name>
-	<version>1.18.2-SNAPSHOT</version>
+	<version>1.19.1-SNAPSHOT</version>
 	<description><![CDATA[Global appNG administration]]></description>
 	<url>https://appng.org</url>