From ea75022ffc1ab434c444c9b7bd0b8ec9e4e1720c Mon Sep 17 00:00:00 2001
From: Socrates <socrates@engels>
Date: Wed, 10 Jun 2020 23:42:07 +0200
Subject: [PATCH] Overwrite controller "CRUD" to realize SaveAndShowListAction.

---
 .../babydatenbank/model/Article.java          |  15 ++--------
 web/WEB-INF/lib/addons.jar                    | Bin 42572 -> 42572 bytes
 xava/application.xml                          |   2 +-
 xava/controllers.xml                          |  27 +++++++++++++++---
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/com/yourcompany/babydatenbank/model/Article.java b/src/com/yourcompany/babydatenbank/model/Article.java
index 994903d..503d6af 100644
--- a/src/com/yourcompany/babydatenbank/model/Article.java
+++ b/src/com/yourcompany/babydatenbank/model/Article.java
@@ -11,6 +11,8 @@ import com.yourcompany.babydatenbank.actions.*;
 import java.math.*;
 import java.time.*;
 
+// TODO: Change controller order
+
 @Entity
 @View(members=
 		"name;" +
@@ -226,17 +228,4 @@ public class Article {
 	public void setDiscount(Integer discount) {
 		this.discount = discount;
 	}
-	
-	/*@Stereotype("MONEY")
-	@Calculation("(100 - discount) / 100 * originalPrice")
-	@Column(length=8)
-	public BigDecimal getDiscountedSellPrice() {
-		try {
-			return getOriginalPrice().multiply(BigDecimal.ONE.subtract(new BigDecimal(getDiscount()).divide(new BigDecimal(100), 2, RoundingMode.HALF_EVEN)));
-		} catch(Exception e) {
-			//Log.error(e);
-			return BigDecimal.ZERO;
-		}
-		
-	}*/
 }
diff --git a/web/WEB-INF/lib/addons.jar b/web/WEB-INF/lib/addons.jar
index cfe72ae560aad49ba024e2a44d790dd72ad32d06..4d10ecc098f0370499a024a7128ba1c72629b5cc 100644
GIT binary patch
delta 44
zcmX?ehUv^1CY}IqW)?061`Y;>vpXj8XfmDIvC&*?GSk@|ll>=K0(qOeCLa<408yY2
Awg3PC

delta 44
zcmX?ehUv^1CY}IqW)?061`Y;>cWWo|XfnNByU|>1GSj=Yll>=K0(qOeCLa<409U#Z
A4gdfE

diff --git a/xava/application.xml b/xava/application.xml
index fd4460d..8580c07 100644
--- a/xava/application.xml
+++ b/xava/application.xml
@@ -1 +1 @@
-<?xml version = "1.0" encoding = "ISO-8859-1"?>

<!DOCTYPE application SYSTEM "dtds/application.dtd">

<application name="Babydatenbank"> 
	
	<!-- 
	A default module for each entity is assumed with the
	controllers on <default-module/>
	-->
	<default-module>		  
		<controller name="BabydatenbankDefaultController"/>		
	</default-module>
	
	<!-- 
	You can define additional modules, for example:	  
	<module name="OnlyReadTeacher">
		<model name="Teacher"/>
		<controller name="Print"/>
	</module>		
	-->
	
</application>
\ No newline at end of file
+<?xml version = "1.0" encoding = "ISO-8859-1"?>

<!DOCTYPE application SYSTEM "dtds/application.dtd">

<application name="Babydatenbank"> 
	
	<!-- 
	A default module for each entity is assumed with the
	controllers on <default-module/>
	-->
	<default-module>		  
		<controller name="Typical"/>		
	</default-module>
	
	<!-- 
	You can define additional modules, for example:	  
	<module name="OnlyReadTeacher">
		<model name="Teacher"/>
		<controller name="Print"/>
	</module>		
	-->
	
</application>
\ No newline at end of file
diff --git a/xava/controllers.xml b/xava/controllers.xml
index ad78281..a168582 100644
--- a/xava/controllers.xml
+++ b/xava/controllers.xml
@@ -21,9 +21,8 @@
     	</action>
 	</controller>    
     -->
-    <controller name="BabydatenbankDefaultController">
-    	<extends controller="Typical" excluded-actions="new, save, refresh, delete" />
-    	
+    
+    <controller name="CRUD">
     	<action  name="new" 
 			class="org.openxava.actions.NewAction"
 			image="new.gif"
@@ -53,6 +52,26 @@
 			icon="delete"
 			available-on-new="false"
 			keystroke="Control D"/>		
+			<action name="searchByViewKey" hidden="true"			
+			class="org.openxava.actions.SearchByViewKeyAction"/>
+		
+		<action name="searchExecutingOnChange" hidden="true"
+			class="org.openxava.actions.SearchExecutingOnChangeAction"/>
+		
+		<action name="searchReadOnly" hidden="true"					
+			class="org.openxava.actions.SearchReadOnlyAction"/>
+						
+		<action name="deleteSelected" mode="list" confirm="true"
+			process-selected-items="true"
+			image="delete.gif"
+			icon="delete"			 
+			class="org.openxava.actions.DeleteSelectedAction"
+			keystroke="Control D"/>				
+		
+		<action name="deleteRow" mode="NONE" confirm="true"
+			class="org.openxava.actions.DeleteSelectedAction"
+			image="delete.gif"
+			icon="delete"
+			in-each-row="true"/>	
     </controller>
-    
 </controllers>
\ No newline at end of file