[OFBiz] SVN: r6512 - in trunk/applications/content: entitydef widget/compdoc
byersa@svn.ofbiz.org
byersa at svn.ofbiz.org
Mon Jan 16 14:03:06 CST 2006
Author: byersa
Date: 2006-01-16 14:03:00 -0600 (Mon, 16 Jan 2006)
New Revision: 6512
Added:
trunk/applications/content/widget/compdoc/CompDocMenus.xml
Modified:
trunk/applications/content/entitydef/entitygroup.xml
trunk/applications/content/entitydef/entitymodel.xml
trunk/applications/content/widget/compdoc/CompDocScreens.xml
Log:
Added ContentApprovalMaxView. May have been a formatting error in previous version.
Modified: trunk/applications/content/entitydef/entitygroup.xml
===================================================================
--- trunk/applications/content/entitydef/entitygroup.xml 2006-01-16 17:51:48 UTC (rev 6511)
+++ trunk/applications/content/entitydef/entitygroup.xml 2006-01-16 20:03:00 UTC (rev 6512)
@@ -122,7 +122,7 @@
<!-- ========================================================= -->
<entity-group group="org.ofbiz" entity="AssocRevisionItemView" />
- <entity-group group="org.ofbiz" entity="ContentRevisionItemMaxView" />
+ <entity-group group="org.ofbiz" entity="ContentApprovalMaxView" />
</entitygroup>
Modified: trunk/applications/content/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/content/entitydef/entitymodel.xml 2006-01-16 17:51:48 UTC (rev 6511)
+++ trunk/applications/content/entitydef/entitymodel.xml 2006-01-16 20:03:00 UTC (rev 6512)
@@ -132,7 +132,7 @@
</entity>
<entity entity-name="ContentApproval"
package-name="org.ofbiz.content.content"
- title="Content Association Entity">
+ title="Content Approval Entity">
<field name="contentApprovalId" type="id-ne"></field>
<field name="contentId" type="id-ne"></field>
<field name="contentRevisionSeqId" type="id-ne"></field>
@@ -1372,7 +1372,7 @@
title="Latest Revision Children">
<member-entity entity-alias="CRI" entity-name="ContentRevisionItem"/>
<member-entity entity-alias="CA" entity-name="ContentAssoc"/>
- <alias entity-alias="CA" name="contentIdTo"" group-by="false"/>
+ <alias entity-alias="CA" name="contentIdTo" group-by="false"/>
<alias entity-alias="CA" name="contentAssocTypeId" group-by="false"/>
<alias entity-alias="CA" name="thruDate" group-by="false"/>
<alias entity-alias="CA" name="fromDate" group-by="false"/>
@@ -1384,5 +1384,19 @@
<key-map field-name="contentId" rel-field-name="itemContentId"/>
</view-link>
</view-entity>
+ <view-entity entity-name="ContentApprovalMaxView"
+ package-name="org.ofbiz.content.compdoc"
+ title="Content Association Entity">
+ <member-entity entity-alias="CA" entity-name="ContentApproval"/>
+ <alias entity-alias="CA" name="contentApprovalId" group-by="false"></alias>
+ <alias entity-alias="CA" name="contentId" group-by="true"></alias>
+ <alias entity-alias="CA" name="contentRevisionSeqId" group-by="true"></alias>
+ <alias entity-alias="CA" name="partyId" group-by="false"></alias>
+ <alias entity-alias="CA" name="roleTypeId" group-by="false"></alias>
+ <alias entity-alias="CA" name="approvalStatusId" group-by="false"></alias>
+ <alias entity-alias="CA" name="approvalDate" group-by="false"></alias>
+ <alias entity-alias="CA" name="sequenceNum" group-by="false"></alias>
+ <alias entity-alias="CA" name="comments" group-by="false"></alias>
+ </view-entity>
</entitymodel>
Added: trunk/applications/content/widget/compdoc/CompDocMenus.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-01-16 17:51:48 UTC (rev 6511)
+++ trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-01-16 20:03:00 UTC (rev 6512)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Copyright (c) 2003-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.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd">
+ <menu name="empty" default-title-style="tabButton"
+ default-selected-style="tabButtonSelected"
+ default-menu-item-name="content"
+ orientation="horizontal"
+ menu-width="100%"
+ default-tooltip-style="tabletext" default-widget-style="tabButton"
+ default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
+ default-permission-entity-action="_ADMIN"
+ default-associated-content-id="${userLogin.userLoginId}"
+ selected-menuitem-context-field-name="currentMenuItemName"
+ title="" type="simple">
+ </menu>
+
+ <menu name="find" default-title-style="tabButton"
+ default-selected-style="tabButtonSelected"
+ default-menu-item-name="content"
+ orientation="horizontal"
+ menu-width="100%"
+ default-tooltip-style="tabletext" default-widget-style="tabButton"
+ default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
+ default-permission-entity-action="_ADMIN"
+ default-associated-content-id="${userLogin.userLoginId}"
+ selected-menuitem-context-field-name="currentMenuItemName"
+ title="" type="simple">
+ <menu-item name="find" title="Find" >
+ <link target="FindCompDocTemplate"/>
+ </menu-item>
+
+ </menu>
+
+ <menu name="tree" default-title-style="tabButton"
+ default-selected-style="tabButtonSelected"
+ default-menu-item-name="content"
+ orientation="horizontal"
+ menu-width="100%"
+ default-tooltip-style="tabletext" default-widget-style="tabButton"
+ default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
+ default-permission-entity-action="_ADMIN"
+ default-associated-content-id="${userLogin.userLoginId}"
+ selected-menuitem-context-field-name="currentMenuItemName"
+ title="" type="simple">
+ <menu-item name="edit-cdt" title="Edit Template" >
+ <link target="EditCompDocTemplate?contentId=${contentId}&templateRevisionSeqId=${templateRevisionSeqId}"/>
+ </menu-item>
+ <menu-item name="approval-cdt" title="Req'd Approval" >
+ <link target="ListTemplateApprovals?contentId=${contentId}&templateRevisionSeqId=${templateRevisionSeqId}"/>
+ </menu-item>
+ <menu-item name="rev-cdt" title="Template Revisions" >
+ <link target="ListTemplateRevisions?contentId=${contentId}&templateRevisionSeqId=${templateRevisionSeqId}"/>
+ </menu-item>
+ <menu-item name="approval-cdi" title="Instance Approval" >
+ <link target="ListInstanceApprovals?contentId=${contentId}&templateRevisionSeqId=${templateRevisionSeqId}"/>
+ </menu-item>
+ <menu-item name="rev-cdi" title="Instance Revisions" >
+ <link target="ListInstanceRevisions?contentId=${contentId}&templateRevisionSeqId=${templateRevisionSeqId}"/>
+ </menu-item>
+ <menu-item name="edit-data" title="Edit Data" >
+ <link target="EditInstanceData?contentId=${contentId}&templateRevisionSeqId=${templateRevisionSeqId}"/>
+ </menu-item>
+
+ </menu>
+
+ <menu name="main" default-title-style="tabButton"
+ default-selected-style="tabButtonSelected"
+ default-menu-item-name="content"
+ orientation="horizontal"
+ menu-width="100%"
+ default-tooltip-style="tabletext" default-widget-style="tabButton"
+ default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
+ default-permission-entity-action="_ADMIN"
+ default-associated-content-id="${userLogin.userLoginId}"
+ selected-menuitem-context-field-name="currentMenuItemName"
+ title="" type="simple">
+
+
+ <menu-item name="FindContent" title="Find" >
+ <link target="FindContent"/>
+ </menu-item>
+
+ <menu-item name="EditContent" title="Content" >
+ <condition>
+ <not>
+ <if-empty field-name="contentId" />
+ </not>
+ </condition>
+ <link target="EditContent?contentId=${contentId}"/>
+ </menu-item>
+
+ <menu-item name="AddContent" title="Content" >
+ <condition>
+ <if-empty field-name="contentId" />
+ </condition>
+ <link target="AddContent"/>
+ </menu-item>
+
+ <menu-item name="contentassoc" title="Association" >
+ <condition disabled-style="buttontextdisabled">
+ <not>
+ <if-empty field-name="contentId" />
+ </not>
+ </condition>
+ <link target="EditContentAssoc?contentId=${contentId}"/>
+ </menu-item>
+
+ <menu-item name="role" title="Role" >
+ <condition disabled-style="buttontextdisabled">
+ <not>
+ <if-empty field-name="contentId" />
+ </not>
+ </condition>
+ <link target="EditContentRole?contentId=${contentId}"/>
+ </menu-item>
+
+ <menu-item name="purpose" title="Purpose" >
+ <condition disabled-style="buttontextdisabled">
+ <not>
+ <if-empty field-name="contentId" />
+ </not>
+ </condition>
+ <link target="EditContentPurpose?contentId=${contentId}"/>
+ </menu-item>
+
+ <menu-item name="attribute" title="Attribute" >
+ <condition disabled-style="buttontextdisabled">
+ <not>
+ <if-empty field-name="contentId" />
+ </not>
+ </condition>
+ <link target="EditContentAttribute?contentId=${contentId}"/>
+ </menu-item>
+
+ <menu-item name="metadata" title="Metadata" >
+ <condition disabled-style="buttontextdisabled">
+ <not>
+ <if-empty field-name="contentId" />
+ </not>
+ </condition>
+ <link target="EditContentMetaData?contentId=${contentId}"/>
+ </menu-item>
+
+
+ </menu>
+
+
+</menus>
Modified: trunk/applications/content/widget/compdoc/CompDocScreens.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-01-16 17:51:48 UTC (rev 6511)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-01-16 20:03:00 UTC (rev 6512)
@@ -366,12 +366,11 @@
</condition>
<widgets>
<container>
- <label text="${contentName}[${contentId}][${maxRevisionSeqId}]" style="responseheader" />
+ <link text="${contentName}[${contentId}][${maxRevisionSeqId}]" style="responseheader" target="EditCompDocTemplate?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}&maxRevisionSeqId=${maxRevisionSeqId}" />
+ <link text="Edit" target="EditCompDocTemplate?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}&maxRevisionSeqId=${maxRevisionSeqId}" style="tabButton" />
<link text="+Child" target="AddCompDocTemplate?caContentIdTo=${contentId}&caSequenceNum=9999" style="tabButton" target-window="_top" />
<link text="+Bef" target="EditCompDocTemplate?caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caSequenceNum=${seqNumBefore}&caFromDate=${caFromDate}" style="tabButton" target-window="_top" />
<link text="+Aft" target="EditCompDocTemplate?caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caSequenceNum=${seqNumAfter}&caFromDate=${caFromDate}" style="tabButton" target-window="_top" />
- <link text="Instance" target="EditCompDocInstance?contentId=${contentId}" style="tabButton" />
- <link text="Edit" target="EditCompDocTemplate?contentId=${contentId}&caContentIdTo=${caContentIdTo}&caContentAssocTypeId=${caContentAssocTypeId}&caFromDate=${caFromDate}" style="tabButton" />
<!--
<container style="responsetext">
<label text="${description}" style="responsetext" />
More information about the Svn
mailing list