[OFBiz] SVN: r7696 - in trunk/specialized/opentravelsystem/webapp/hotelbackend: WEB-INF screens
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Tue May 30 01:34:48 CDT 2006
Author: hansbak
Date: 2006-05-30 01:34:31 -0500 (Tue, 30 May 2006)
New Revision: 7696
Modified:
trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/ContentForms.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/ContentScreens.xml
trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml
Log:
fault fixing of the content part
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml 2006-05-30 06:33:28 UTC (rev 7695)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/WEB-INF/controller.xml 2006-05-30 06:34:31 UTC (rev 7696)
@@ -3103,6 +3103,13 @@
<response name="error" type="view" value="EditContent"/>
</request-map>
+ <request-map uri="copyContent">
+ <security auth="true" https="true"/>
+ <event invoke="copyContentAndElectronicTextandAssoc" type="service"/>
+ <response name="success" type="view" value="EditContent"/>
+ <response name="error" type="view" value="EditContent"/>
+ </request-map>
+
<request-map uri="updateContent">
<security auth="true" https="true"/>
<event invoke="persistContentAndAssoc" type="service"/>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/ContentForms.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/ContentForms.xml 2006-05-30 06:33:28 UTC (rev 7695)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/ContentForms.xml 2006-05-30 06:34:31 UTC (rev 7696)
@@ -1,27 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *@author Olivier.Heintz at nereide.biz
- *@version $Rev: 5912 $
- *@since 3.0
+ $Id: $
+
+ Copyright 2001-2006 The Apache Software Foundation
+
+ Licensed 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.
-->
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -98,10 +91,12 @@
<!--alt-target use-when="currentValue==null" target="createContent"/-->
<field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field>
<field name="contentId"><hidden/></field>
+ <field name="textData" use-when="currentValue==null"><hidden value=" "/></field>
<field name="contentName" position="1"><text/></field>
<field name="description" position="2"><text/></field>
<field name="contentTypeId" use-when="currentValue==null"><hidden value="DOCUMENT"/></field>
- <field name="contentTypeId" use-when="currentValue!=null"><hidden/></field>
+ <field name="contentTypeId" use-when="currentValue!=null" widget-style="tabletext">
+ <display-entity entity-name="ContentType" description="${description}"/></field>
<field name="statusId" use-when="currentValue!=null" widget-style="selectBox">
<drop-down allow-empty="false" current-description="${currentStatus.description}">
<entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
@@ -149,7 +144,7 @@
<field name="submitButton" title="Update" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="AddContentAssoc" default-title-style="tableheadtext"
+ <form name="AddContentAssoc" default-title-style="tableheadtext" default-map-name="dumy"
default-tooltip-style="tabletext" default-widget-style="inputBox"
target="createContentAssoc" title="" type="single">
<field name="contentId"><hidden/></field>
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/ContentScreens.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/ContentScreens.xml 2006-05-30 06:33:28 UTC (rev 7695)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/ContentScreens.xml 2006-05-30 06:34:31 UTC (rev 7696)
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2004 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * $Id: CatalogScreens.xml 5851 2005-09-28 10:12:17Z hansbak $
+ $Id: $
+
+ Copyright 2001-2006 The Apache Software Foundation
+
+ Licensed 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.
-->
<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-screen.xsd">
Modified: trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml
===================================================================
--- trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml 2006-05-30 06:33:28 UTC (rev 7695)
+++ trunk/specialized/opentravelsystem/webapp/hotelbackend/screens/Menus.xml 2006-05-30 06:34:31 UTC (rev 7696)
@@ -1,26 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright (c) 2004-2005 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * $Id: Menus.xml jacopo $ Hans Bakker (h.bakker at antwebsystems.com)
+ $Id: $
+
+ Copyright 2001-2006 The Apache Software Foundation
+
+ Licensed 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.
-->
<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../framework/widget/dtd/widget-menu.xsd">
@@ -37,7 +31,7 @@
<menu name="ContentTabBar" title="simple">
<menu-item name="find" title="Find" >
<condition>
- <not><if-empty field-name="tabButtonItem"/></not>
+ <if-compare field-name="tabButtonItem" operator="not-equals" value="find"/>
</condition>
<link target="findWebsiteContent"/>
</menu-item>
@@ -71,18 +65,19 @@
<condition>
<or>
<not><if-empty field-name="currentValue"/></not>
- <if-empty field-name="tabButtonItem"/>
+ <if-compare field-name="tabButtonItem" operator="equals" value="find"/>
</or>
</condition>
<link target="editContent"/>
</menu-item>
<menu-item name="copyContent" title="Copy Content">
<condition>
- <or>
+ <and>
<not><if-empty field-name="currentValue"/></not>
- </or>
+ <if-compare field-name="currentValue.contentTypeId" operator="equals" value="DOCUMENT"/>
+ </and>
</condition>
- <link target="copyContent"/>
+ <link target="copyContent?contentId=${contentId}"/>
</menu-item>
</menu>
More information about the Svn
mailing list