giacomo 01/01/13 08:28:50
Modified: src/org/apache/cocoon/acting Tag: xml-cocoon2
DelEmployeeAction.java
webapp/docs/samples/forms Tag: xml-cocoon2 employee.xsp
Log:
Fixed deletion of employees
Revision Changes Path
No revision
No revision
1.1.2.4 +2 -1
xml-cocoon/src/org/apache/cocoon/acting/Attic/DelEmployeeAction.java
Index: DelEmployeeAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/acting/Attic/DelEmployeeAction.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DelEmployeeAction.java 2001/01/11 21:01:42 1.1.2.3
+++ DelEmployeeAction.java 2001/01/13 16:28:49 1.1.2.4
@@ -33,7 +33,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
- * @version CVS $Revision: 1.1.2.3 $ $Date: 2001/01/11 21:01:42 $
+ * @version CVS $Revision: 1.1.2.4 $ $Date: 2001/01/13 16:28:49 $
*/
public class DelEmployeeAction extends ComposerAction {
@@ -61,6 +61,7 @@
public Map act (EntityResolver resolver, Map objectModel, String src,
Parameters par) throws Exception {
HttpServletRequest req = (HttpServletRequest)
objectModel.get(Constants.REQUEST_OBJECT);
String id = req.getParameter("employee");
+ log.debug("deleting employee " + id);
String name = req.getParameter("name");
if (deleteEmployee(id) == true) {
No revision
No revision
1.1.2.5 +16 -15 xml-cocoon/webapp/docs/samples/forms/Attic/employee.xsp
Index: employee.xsp
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/docs/samples/forms/Attic/employee.xsp,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- employee.xsp 2001/01/11 19:58:43 1.1.2.4
+++ employee.xsp 2001/01/13 16:28:50 1.1.2.5
@@ -3,7 +3,7 @@
<xsp:page
language="java"
xmlns:xsp="http://apache.org/xsp";
- xmlns:esql="http://apache.org/cocoon/SQL/v2";
+ xmlns:esql="http://apache.org/cocoon/SQL/v2";
>
<page>
<xsp:logic>
@@ -19,12 +19,12 @@
<select size="1" name="employee"
onChange="top.location.href=window.location.pathname +
'?employee=' +
document.forms['EmployeeSelection'].employee.options[document.forms['EmployeeSelection'].employee.options.selectedIndex].value">
<option value="-1">-- New employee --</option>
- <esql:connection>
- <esql:pool>personnel</esql:pool>
+ <esql:connection>
+ <esql:pool>personnel</esql:pool>
<esql:execute-query>
<esql:query>select id, department_id, name from
employee_table order by name</esql:query>
<esql:results>
- <esql:row-results>
+ <esql:row-results>
<option>
<xsp:attribute name="value"><esql:get-int
column="id"/></xsp:attribute>
<xsp:attribute
name="selected"><xsp:expr>(<esql:get-string
column="id"/>.equals(empID)?"true":"false")</xsp:expr></xsp:attribute>
@@ -35,25 +35,26 @@
</xsp:logic>
<esql:get-string column="name"/>
</option>
- </esql:row-results>
+ </esql:row-results>
</esql:results>
</esql:execute-query>
- </esql:connection>
+ </esql:connection>
</select>
</form>
<form action="" method="POST" name="EmployeeEntry">
<script>document.forms["EmployeeEntry"].action =
window.location.pathname</script>
+ <input type="hidden" name="employee"/>
+ <script>document.forms["EmployeeEntry"].employee.value =
document.forms['EmployeeSelection'].employee.options[document.forms['EmployeeSelection'].employee.options.selectedIndex].value</script>
<para>Employee Name: <input name="name" type="text"/>
- <xsp:logic>
- if (empID != null && !empID.equals("-1")) {
- <script>document.forms["EmployeeEntry"].name.value =
document.forms['EmployeeSelection'].employee.options[document.forms['EmployeeSelection'].employee.options.selectedIndex].text</script>
- }
- </xsp:logic>
+ <script>
+ if
(document.forms['EmployeeSelection'].employee.options[document.forms['EmployeeSelection'].employee.options.selectedIndex].value
!= -1)
+ document.forms["EmployeeEntry"].name.value =
document.forms['EmployeeSelection'].employee.options[document.forms['EmployeeSelection'].employee.options.selectedIndex].text
+ </script>
</para>
<para>Department:
<select name="department">
- <esql:connection>
- <esql:pool>personnel</esql:pool>
+ <esql:connection>
+ <esql:pool>personnel</esql:pool>
<esql:execute-query>
<esql:query>select id, name from department_table order by
name</esql:query>
<esql:results>
@@ -63,10 +64,10 @@
<xsp:attribute
name="selected"><xsp:expr>(<esql:get-string
column="id"/>.equals(depID)?"true":"false")</xsp:expr></xsp:attribute>
<esql:get-string column="name"/>
</option>
- </esql:row-results>
+ </esql:row-results>
</esql:results>
</esql:execute-query>
- </esql:connection>
+ </esql:connection>
</select>
</para>
<xsp:logic>
