You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2008/11/15 09:10:24 UTC
svn commit: r714220 - in /ofbiz/trunk/applications/humanres:
script/org/ofbiz/humanres/ servicedef/ webapp/humanres/WEB-INF/
webapp/humanres/error/
Author: ashish
Date: Sat Nov 15 00:10:23 2008
New Revision: 714220
URL: http://svn.apache.org/viewvc?rev=714220&view=rev
Log:
Adding error*.jsp files.
Controller request modification, improved the service definition and implementation for "fromDate" field.
Added:
ofbiz/trunk/applications/humanres/webapp/humanres/error/
ofbiz/trunk/applications/humanres/webapp/humanres/error/error.jsp (with props)
ofbiz/trunk/applications/humanres/webapp/humanres/error/error403.jsp (with props)
ofbiz/trunk/applications/humanres/webapp/humanres/error/error404.jsp (with props)
Modified:
ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
ofbiz/trunk/applications/humanres/servicedef/services.xml
ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=714220&r1=714219&r2=714220&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original)
+++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Sat Nov 15 00:10:23 2008
@@ -605,6 +605,10 @@
<make-value entity-name="EmplPositionTypeRate" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
+ <if-empty field="newEntity.fromDate">
+ <now-timestamp-to-env env-name="nowTimeStamp"/>
+ <set field="newEntity.fromDate" from-field="nowTimeStamp"/>
+ </if-empty>
<field-to-result field-name="newEntity.emplPositionTypeId" result-name="emplPositionTypeId"/>
<field-to-result field-name="newEntity.periodTypeId" result-name="periodTypeId"/>
<field-to-result field-name="newEntity.fromDate" result-name="fromDate"/>
Modified: ofbiz/trunk/applications/humanres/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/servicedef/services.xml?rev=714220&r1=714219&r2=714220&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/humanres/servicedef/services.xml Sat Nov 15 00:10:23 2008
@@ -637,8 +637,9 @@
location="org/ofbiz/humanres/HumanResServices.xml" invoke="createEmplPositionTypeRate" auth="true">
<description>Create Valid EmplPositionTypeRate</description>
<permission-service service-name="humanResManagerPermission" main-action="CREATE"/>
- <auto-attributes mode="INOUT" include="pk" optional="true"/>
+ <auto-attributes mode="INOUT" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
+ <override name="fromDate" optional="true"/>
</service>
<service name="updateEmplPositionTypeRate" engine="simple" default-entity-name="EmplPositionTypeRate"
Modified: ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml?rev=714220&r1=714219&r2=714220&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/WEB-INF/controller.xml Sat Nov 15 00:10:23 2008
@@ -674,7 +674,7 @@
</request-map>
<request-map uri="updateEmplPositionType">
<security https="true" auth="true"/>
- <event type="service-multi" invoke="updateEmplPositionType"/>
+ <event type="service" invoke="updateEmplPositionType"/>
<response name="success" type="view" value="EditEmplPositionTypes"/>
</request-map>
<request-map uri="EditEmplPositionTypeRates">
Added: ofbiz/trunk/applications/humanres/webapp/humanres/error/error.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/error/error.jsp?rev=714220&view=auto
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/error/error.jsp (added)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/error/error.jsp Sat Nov 15 00:10:23 2008
@@ -0,0 +1,52 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page import="org.ofbiz.base.util.*" %>
+<html>
+<head>
+<title>Open For Business Message</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
+
+<body bgcolor="#FFFFFF">
+<div align="center">
+ <br/>
+ <table width="100%" border="1" height="200">
+ <tr>
+ <td>
+ <table width="100%" border="0" height="200">
+ <tr bgcolor="#CC6666">
+ <td height="45">
+ <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+</div>
+<div align="center"></div>
+</body>
+</html>
Propchange: ofbiz/trunk/applications/humanres/webapp/humanres/error/error.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/humanres/webapp/humanres/error/error.jsp
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/humanres/webapp/humanres/error/error.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/humanres/webapp/humanres/error/error403.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/error/error403.jsp?rev=714220&view=auto
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/error/error403.jsp (added)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/error/error403.jsp Sat Nov 15 00:10:23 2008
@@ -0,0 +1,26 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<html>
+<head>
+<title>ERROR!</title>
+</head>
+<body>
+<h3>An Error 403 Happened: Access to resource Forbidden</h3>
+</body>
+</html>
Propchange: ofbiz/trunk/applications/humanres/webapp/humanres/error/error403.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/humanres/webapp/humanres/error/error403.jsp
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/humanres/webapp/humanres/error/error403.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: ofbiz/trunk/applications/humanres/webapp/humanres/error/error404.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/error/error404.jsp?rev=714220&view=auto
==============================================================================
--- ofbiz/trunk/applications/humanres/webapp/humanres/error/error404.jsp (added)
+++ ofbiz/trunk/applications/humanres/webapp/humanres/error/error404.jsp Sat Nov 15 00:10:23 2008
@@ -0,0 +1,26 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<html>
+<head>
+<title>ERROR!</title>
+</head>
+<body>
+<h3>An Error 404 Happened: Request resource Not Found</h3>
+</body>
+</html>
Propchange: ofbiz/trunk/applications/humanres/webapp/humanres/error/error404.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/humanres/webapp/humanres/error/error404.jsp
------------------------------------------------------------------------------
svn:keywords = Date Rev Author URL Id
Propchange: ofbiz/trunk/applications/humanres/webapp/humanres/error/error404.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain