* Terms - Prepared support for rename * ObjectType.java - Added ID for serialization - Added RELATIONSHIP class constant * struts.xml - Added Relationship actions * General - Relationships between two terms can be added and listed - Clean-up: + Renamed methods according to their purpose + Fixed RDM and corresponding properties/annotations + RelationShipTypeAction.java
/trunk/WebContent/user/relationshipList.jsp |
---|
File deleted |
\ No newline at end of file |
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: userAdd.jsp |
=================================================================== |
--- userAdd.jsp (revision 34) |
+++ userAdd.jsp (nonexistent) |
@@ -1,17 +0,0 @@ |
-<html> |
-<head> |
-<title>User added</title> |
-</head> |
-<body> |
- |
- <h1> |
- User hinzugefügt |
- </h1> |
- <p> |
- Der Benutzer wurde hinzugefügt |
- </p> |
- <p> |
- TODO: Weiterleitung!! |
- </p> |
-</body> |
-</html> |
\ No newline at end of file |
/userAdd.jsp |
---|
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: relationshipAdd.jsp |
=================================================================== |
--- relationshipAdd.jsp (revision 34) |
+++ relationshipAdd.jsp (nonexistent) |
@@ -1,17 +0,0 @@ |
-<html> |
-<head> |
-<title>Relationship added</title> |
-</head> |
-<body> |
- |
- <h1> |
- Beziehung hinzugefügt |
- </h1> |
- <p> |
- Die Beziehung wurde hinzugefügt |
- </p> |
- <p> |
- TODO: Weiterleitung!! |
- </p> |
-</body> |
-</html> |
\ No newline at end of file |
/relationshipAdd.jsp |
---|
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: relationshipAddForm.jsp |
=================================================================== |
--- relationshipAddForm.jsp (revision 34) |
+++ relationshipAddForm.jsp (nonexistent) |
@@ -1,18 +0,0 @@ |
-<%@taglib uri="/struts-tags" prefix="s"%> |
-<html> |
- <head> |
- <title>Beziehung hinzufügen</title> |
- </head> |
- <body> |
- <h1> |
- Beziehung hinzufügen |
- </h1> |
- <s:form action="relationshipSave"> |
- <s:hidden name="relationship.objectId" /> |
- <s:select name="term1" list="terms" listKey="objectId" listValue="name" label="Begriff 1"/> |
- <s:select name="type" list="relationshipTypes" listKey="id" listValue="nameFrom" label="Beziehungstyp"/> |
- <s:select name="term2" list="terms" listKey="objectId" listValue="name" label="Begriff 2"/> |
- <s:submit value="Hinzufügen" /> |
- </s:form> |
- </body> |
-</html> |
/relationshipAddForm.jsp |
---|
Property changes: |
Deleted: svn:mime-type |
## -1 +0,0 ## |
-text/plain |
\ No newline at end of property |
Index: nav.jsp |
=================================================================== |
--- nav.jsp (revision 34) |
+++ nav.jsp (revision 33) |
@@ -7,14 +7,14 @@ |
<li>Begriffe |
<ul> |
- <li><a href="termAdd">Hinzufügen</a></li> |
- <li><a href="termList">Anzeigen<!-- Ändern, Löschen --></a></li> |
+ <li><a href="termAddForm">Hinzufügen</a></li> |
+ <li><a href="termList">Ändern, Löschen</a></li> |
</ul></li> |
<li>Beziehungen |
<ul> |
- <li><a href="relationshipAdd">Hinzufügen</a></li> |
- <li><a href="relationshipList">Ändern, Löschen</a></li> |
+ <li><a href="">Hinzufügen</a></li> |
+ <li><a href="">Ändern, Löschen</a></li> |
</ul></li> |
<li>User-Settings |
/trunk/WebContent/user/termAddForm.jsp |
---|
7,11 → 7,7 |
<h1> |
Begriff hinzufügen |
</h1> |
<s:form action="termSave"> |
<s:if test="term.edit"> |
<s:hidden name="edit" value="1" /> |
</s:if> |
<s:hidden name="term.objectId" /> |
<s:form action="doTermAdd"> |
<s:textfield name="term.name" label="Name" /> |
<s:if test="term.name != ''"> |
<s:submit value="Umbenennen" /> |
/trunk/WebContent/user/termList.jsp |
---|
15,12 → 15,26 |
</s:if> |
<s:else> |
<table> |
<tr> |
<th>Begriff</th> |
</tr> |
<s:iterator value="termList" status="stat"> |
<tr> |
<td><s:property value="name" /></td> |
<td><s:url id="editURL" action="editTerm"> |
<s:param name="id" value="%{objectId}"></s:param> |
</s:url> <s:a href="%{editURL}"> |
<img src="${contextPath}/resources/icons/page_white_edit.png" alt="edit" /> |
</s:a></td> |
<td><s:url id="deleteURL" action="deleteTerm"> |
<s:param name="id" value="%{id}"></s:param> |
</s:url> <s:a href="%{deleteURL}"> |
<img src="${contextPath}/resources/icons/delete.png" alt="delete" /> |
</s:a></td> |
</tr> |
</s:iterator> |
</tbody> |
</table> |
</s:else> |
</body> |