svn commit: r509321 [5/7] - in /ofbiz/trunk/applications: content/data/ content/script/org/ofbiz/conte
Locked
svn commit: r509321 [5/7] - in /ofbiz/trunk/applications: content/data/ content/script/org/ofbiz/conte
 
|
Modified: ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_contenttypes.xml Mon Feb 19 11:53:06 2007 @@ -23,257 +23,234 @@ <description>Content Component Services</description> <vendor>OFBiz</vendor> - <!--ContentType services.--> - <service name="createContentType" engine="simple" default-entity-name="ContentType" - location="org/ofbiz/content/content/ContentServices.xml" - invoke="createContentType" auth="true"> + <!-- ContentType services --> + <service name="createContentType" engine="simple" default-entity-name="ContentType" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="createContentType"> <description>Create a ContentType</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateContentType" engine="simple" default-entity-name="ContentType" - location="org/ofbiz/content/content/ContentServices.xml" invoke="updateContentType" auth="true"> + <service name="updateContentType" engine="simple" default-entity-name="ContentType" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="updateContentType"> <description>Update a ContentType</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeContentType" engine="simple" default-entity-name="ContentType" - location="org/ofbiz/content/content/ContentServices.xml" invoke="removeContentType" auth="true"> + <service name="removeContentType" engine="simple" default-entity-name="ContentType" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="removeContentType" > <description>Remove ContentType</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <!--ContentAssocType services.--> - <service name="createContentAssocType" engine="simple" default-entity-name="ContentAssocType" - location="org/ofbiz/content/content/ContentServices.xml" - invoke="createContentAssocType" auth="true"> + <!-- ContentAssocType services --> + <service name="createContentAssocType" engine="simple" default-entity-name="ContentAssocType" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="createContentAssocType"> <description>Create a ContentAssocType</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateContentAssocType" engine="simple" default-entity-name="ContentAssocType" - location="org/ofbiz/content/content/ContentServices.xml" - invoke="updateContentAssocType" auth="true"> + <service name="updateContentAssocType" engine="simple" default-entity-name="ContentAssocType" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="updateContentAssocType"> <description>Update a ContentAssocType</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeContentAssocType" engine="simple" default-entity-name="ContentAssocType" - invoke="removeContentAssocType" - location="org/ofbiz/content/content/ContentServices.xml" auth="true"> + <service name="removeContentAssocType" engine="simple" default-entity-name="ContentAssocType" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="removeContentAssocType"> <description>Remove ContentAssocType</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <!--ContentTypeAttr services.--> - <service name="createContentTypeAttr" engine="simple" invoke="createContentTypeAttr" - location="org/ofbiz/content/content/ContentServices.xml" - default-entity-name="ContentTypeAttr" auth="true"> + <!-- ContentTypeAttr services --> + <service name="createContentTypeAttr" engine="simple" default-entity-name="ContentTypeAttr" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="createContentTypeAttr"> <description>Create a ContentTypeAttr</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeContentTypeAttr" engine="simple" invoke="removeContentTypeAttr" - location="org/ofbiz/content/content/ContentServices.xml" auth="true"> + <service name="removeContentTypeAttr" engine="simple" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="removeContentTypeAttr"> <description>Remove ContentTypeAttr</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes entity-name="ContentTypeAttr" include="pk" mode="IN" optional="false"/> </service> <!--ContentAssocPredicate services.--> - <service name="createContentAssocPredicate" engine="simple" - location="org/ofbiz/content/content/ContentServices.xml" - invoke="createContentAssocPredicate" - default-entity-name="ContentAssocPredicate" auth="true"> + <service name="createContentAssocPredicate" engine="simple" default-entity-name="ContentAssocPredicate" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="createContentAssocPredicate"> <description>Create a ContentAssocPredicate</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateContentAssocPredicate" engine="simple" - location="org/ofbiz/content/content/ContentServices.xml" - invoke="updateContentAssocPredicate" - default-entity-name="ContentAssocPredicate" auth="true"> + <service name="updateContentAssocPredicate" engine="simple" default-entity-name="ContentAssocPredicate" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="updateContentAssocPredicate"> <description>Update a ContentAssocPredicate</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeContentAssocPredicate" engine="simple" - location="org/ofbiz/content/content/ContentServices.xml" - invoke="removeContentAssocPredicate" - default-entity-name="ContentAssocPredicate" auth="true"> + <service name="removeContentAssocPredicate" engine="simple" default-entity-name="ContentAssocPredicate" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="removeContentAssocPredicate"> <description>Remove ContentAssocPredicate</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes entity-name="ContentAssocPredicate" include="pk" mode="IN" optional="false"/> </service> - <!--ContentPurposeType services.--> - <service name="createContentPurposeType" engine="simple" default-entity-name="ContentPurposeType" - location="org/ofbiz/content/content/ContentServices.xml" - invoke="createContentPurposeType" - auth="true"> + <!-- ContentPurposeType services --> + <service name="createContentPurposeType" engine="simple" default-entity-name="ContentPurposeType" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="createContentPurposeType"> <description>Create a ContentPurposeType</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateContentPurposeType" engine="simple" default-entity-name="ContentPurposeType" - location="org/ofbiz/content/content/ContentServices.xml" - invoke="updateContentPurposeType" - auth="true"> + <service name="updateContentPurposeType" engine="simple" default-entity-name="ContentPurposeType" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="updateContentPurposeType"> <description>Update a ContentPurposeType</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeContentPurposeType" engine="simple" default-entity-name="ContentPurposeType" - location="org/ofbiz/content/content/ContentServices.xml" - invoke="removeContentPurposeType" auth="true"> + <service name="removeContentPurposeType" engine="simple" default-entity-name="ContentPurposeType" auth="true" + location="org/ofbiz/content/content/ContentServices.xml" invoke="removeContentPurposeType"> <description>Remove ContentPurposeType</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <!--CharacterSet services.--> - <service name="createCharacterSet" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="createCharacterSet" - default-entity-name="CharacterSet" auth="true"> + <!-- CharacterSet services --> + <service name="createCharacterSet" engine="simple" default-entity-name="CharacterSet" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="createCharacterSet"> <description>Create a CharacterSet</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateCharacterSet" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="updateCharacterSet" - default-entity-name="CharacterSet" auth="true"> + <service name="updateCharacterSet" engine="simple" default-entity-name="CharacterSet" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="updateCharacterSet"> <description>Update a CharacterSet</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeCharacterSet" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="removeCharacterSet" - default-entity-name="CharacterSet" auth="true"> + <service name="removeCharacterSet" engine="simple" default-entity-name="CharacterSet" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="removeCharacterSet"> <description>Remove CharacterSet</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <!--DataResourceType services.--> - <service name="createDataResourceType" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="createDataResourceType" - default-entity-name="DataResourceType" auth="true"> + <!-- DataResourceType services --> + <service name="createDataResourceType" engine="simple" default-entity-name="DataResourceType" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="createDataResourceType"> <description>Create a DataResourceType</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateDataResourceType" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="updateDataResourceType" - default-entity-name="DataResourceType" auth="true"> + <service name="updateDataResourceType" engine="simple" default-entity-name="DataResourceType" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="updateDataResourceType"> <description>Update a DataResourceType</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeDataResourceType" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="removeDataResourceType" - default-entity-name="DataResourceType" auth="true"> + <service name="removeDataResourceType" engine="simple" default-entity-name="DataResourceType" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="removeDataResourceType"> <description>Remove DataResourceType</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!--DataResourceTypeAttr services.--> - <service name="createDataResourceTypeAttr" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="createDataResourceTypeAttr" - default-entity-name="DataResourceTypeAttr" auth="true"> + <service name="createDataResourceTypeAttr" engine="simple" default-entity-name="DataResourceTypeAttr" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="createDataResourceTypeAttr"> <description>Create a DataResourceTypeAttr</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateDataResourceTypeAttr" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="updateDataResourceTypeAttr" - default-entity-name="DataResourceTypeAttr" auth="true"> + <service name="updateDataResourceTypeAttr" engine="simple" default-entity-name="DataResourceTypeAttr" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="updateDataResourceTypeAttr"> <description>Update a DataResourceTypeAttr</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeDataResourceTypeAttr" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="removeDataResourceTypeAttr" - default-entity-name="DataResourceTypeAttr" auth="true"> + <service name="removeDataResourceTypeAttr" engine="simple" default-entity-name="DataResourceTypeAttr" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="removeDataResourceTypeAttr"> <description>Remove DataResourceTypeAttr</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <!--FileExtension services.--> - <service name="createFileExtension" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="createFileExtension" - default-entity-name="FileExtension" auth="true"> + <!-- FileExtension services --> + <service name="createFileExtension" engine="simple" default-entity-name="FileExtension" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="createFileExtension"> <description>Create a FileExtension</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateFileExtension" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="updateFileExtension" - default-entity-name="FileExtension" auth="true"> + <service name="updateFileExtension" engine="simple" default-entity-name="FileExtension" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="updateFileExtension"> <description>Update a FileExtension</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeFileExtension" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="removeFileExtension" - default-entity-name="FileExtension" auth="true"> + <service name="removeFileExtension" engine="simple" default-entity-name="FileExtension" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="removeFileExtension"> <description>Remove FileExtension</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <!--MetaDataPredicate services.--> - <service name="createMetaDataPredicate" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="createMetaDataPredicate" - default-entity-name="MetaDataPredicate" auth="true"> + <!-- MetaDataPredicate services --> + <service name="createMetaDataPredicate" engine="simple" default-entity-name="MetaDataPredicate" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="createMetaDataPredicate"> <description>Create a MetaDataPredicate</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateMetaDataPredicate" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="updateMetaDataPredicate" - default-entity-name="MetaDataPredicate" auth="true"> + <service name="updateMetaDataPredicate" engine="simple" default-entity-name="MetaDataPredicate" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="updateMetaDataPredicate"> <description>Update a MetaDataPredicate</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeMetaDataPredicate" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="removeMetaDataPredicate" - default-entity-name="MetaDataPredicate" auth="true"> + <service name="removeMetaDataPredicate" engine="simple" default-entity-name="MetaDataPredicate" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="removeMetaDataPredicate"> <description>Remove MetaDataPredicate</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> - <!--MimeType services.--> - <service name="createMimeType" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="createMimeType" - default-entity-name="MimeType" auth="true"> + <!-- MimeType services --> + <service name="createMimeType" engine="simple" default-entity-name="MimeType" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="createMimeType"> <description>Create a MimeType</description> <auto-attributes include="pk" mode="INOUT" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="updateMimeType" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="updateMimeType" - default-entity-name="MimeType" auth="true"> + <service name="updateMimeType" engine="simple" default-entity-name="MimeType" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="updateMimeType"> <description>Update a MimeType</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> - <service name="removeMimeType" engine="simple" - location="org/ofbiz/content/data/DataServices.xml" - invoke="removeMimeType" - default-entity-name="MimeType" auth="true"> + <service name="removeMimeType" engine="simple" default-entity-name="MimeType" auth="true" + location="org/ofbiz/content/data/DataServices.xml" invoke="removeMimeType"> <description>Remove MimeType</description> <auto-attributes include="pk" mode="IN" optional="false"/> </service> Modified: ofbiz/trunk/applications/content/servicedef/services_survey.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/servicedef/services_survey.xml?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/content/servicedef/services_survey.xml (original) +++ ofbiz/trunk/applications/content/servicedef/services_survey.xml Mon Feb 19 11:53:06 2007 @@ -25,136 +25,156 @@ <!-- Survey Services --> <service name="createSurvey" default-entity-name="Survey" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurvey"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurvey"> <description>Create a Survey</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateSurvey" default-entity-name="Survey" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurvey"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurvey"> <description>Update a Survey</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurvey" default-entity-name="Survey" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurvey"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurvey"> <description>Delete Survey</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <service name="cloneSurvey" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="cloneSurvey"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="cloneSurvey"> <description>Clone a Survey; NOTE: not yet implemented</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <attribute name="surveyId" type="String" mode="IN"/> <attribute name="newSurveyId" type="String" mode="OUT"/> </service> <!-- SurveyMultiResp Services --> <service name="createSurveyMultiResp" default-entity-name="SurveyMultiResp" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyMultiResp"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyMultiResp"> <description>Create a SurveyMultiResp; surveyMultiRespId will be auto-sequenced</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"> <exclude field-name="surveyMultiRespId"/> </auto-attributes> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateSurveyMultiResp" default-entity-name="SurveyMultiResp" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyMultiResp"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyMultiResp"> <description>Update a SurveyMultiResp</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurveyMultiResp" default-entity-name="SurveyMultiResp" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyMultiResp"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyMultiResp"> <description>Delete SurveyMultiResp</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyMultiRespColumn Services --> <service name="createSurveyMultiRespColumn" default-entity-name="SurveyMultiRespColumn" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyMultiRespColumn"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyMultiRespColumn"> <description>Create a SurveyMultiRespColumn; surveyMultiRespColId will be auto-sequenced</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"> <exclude field-name="surveyMultiRespColId"/> </auto-attributes> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateSurveyMultiRespColumn" default-entity-name="SurveyMultiRespColumn" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyMultiRespColumn"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyMultiRespColumn"> <description>Update a SurveyMultiRespColumn</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurveyMultiRespColumn" default-entity-name="SurveyMultiRespColumn" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyMultiRespColumn"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyMultiRespColumn"> <description>Delete SurveyMultiRespColumn</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyPage Services --> <service name="createSurveyPage" default-entity-name="SurveyPage" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyPage"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyPage"> <description>Create a SurveyPage; the surveyPageSeqId will be auto-generated</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"> <exclude field-name="surveyPageSeqId"/> </auto-attributes> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateSurveyPage" default-entity-name="SurveyPage" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyPage"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyPage"> <description>Update a SurveyPage</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurveyPage" default-entity-name="SurveyPage" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyPage"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyPage"> <description>Delete SurveyPage</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyApplType Services --> <service name="createSurveyApplType" default-entity-name="SurveyApplType" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyApplType"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyApplType"> <description>Create a SurveyApplType</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateSurveyApplType" default-entity-name="SurveyApplType" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyApplType"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyApplType"> <description>Update a SurveyApplType</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurveyApplType" default-entity-name="SurveyApplType" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyApplType"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyApplType"> <description>Delete SurveyApplType</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyQuestion Services --> <service name="createSurveyQuestion" default-entity-name="SurveyQuestion" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestion"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestion"> <description>Create a SurveyQuestion</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <attribute name="surveyId" type="String" mode="IN" optional="true"/> </service> <service name="updateSurveyQuestion" default-entity-name="SurveyQuestion" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestion"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestion"> <description>Update a SurveyQuestion</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurveyQuestion" default-entity-name="SurveyQuestion" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestion"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestion"> <description>Delete SurveyQuestion</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyQuestionOption Services --> <service name="createSurveyQuestionOption" default-entity-name="SurveyQuestionOption" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionOption"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionOption"> <description>Create a SurveyQuestionOption</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="all" mode="IN" optional="true"> <exclude field-name="surveyOptionSeqId"/> </auto-attributes> @@ -162,91 +182,105 @@ <override name="surveyQuestionId" optional="false"/> </service> <service name="updateSurveyQuestionOption" default-entity-name="SurveyQuestionOption" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionOption"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionOption"> <description>Update a SurveyQuestionOption</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurveyQuestionOption" default-entity-name="SurveyQuestionOption" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionOption"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionOption"> <description>Delete SurveyQuestionOption</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyQuestionAppl Services --> <service name="createSurveyQuestionAppl" default-entity-name="SurveyQuestionAppl" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionAppl"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionAppl"> <description>Create a SurveyQuestionAppl</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="fromDate" optional="true"/> </service> <service name="updateSurveyQuestionAppl" default-entity-name="SurveyQuestionAppl" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionAppl"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionAppl"> <description>Update a SurveyQuestionAppl</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurveyQuestionAppl" default-entity-name="SurveyQuestionAppl" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionAppl"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionAppl"> <description>Delete SurveyQuestionAppl</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyQuestionCategory Services --> <service name="createSurveyQuestionCategory" default-entity-name="SurveyQuestionCategory" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionCategory"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionCategory"> <description>Create a SurveyQuestionCategory</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateSurveyQuestionCategory" default-entity-name="SurveyQuestionCategory" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionCategory"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionCategory"> <description>Update a SurveyQuestionCategory</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurveyQuestionCategory" default-entity-name="SurveyQuestionCategory" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionCategory"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionCategory"> <description>Delete SurveyQuestionCategory</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyQuestionType Services --> <service name="createSurveyQuestionType" default-entity-name="SurveyQuestionType" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionType"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyQuestionType"> <description>Create a SurveyQuestionType</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateSurveyQuestionType" default-entity-name="SurveyQuestionType" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionType"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionType"> <description>Update a SurveyQuestionType</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurveyQuestionType" default-entity-name="SurveyQuestionType" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionType"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyQuestionType"> <description>Delete SurveyQuestionType</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> <!-- SurveyTrigger Services --> <service name="createSurveyTrigger" default-entity-name="SurveyTrigger" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyTrigger"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="createSurveyTrigger"> <description>Create a SurveyTrigger</description> + <permission-service service-name="contentManagerPermission" main-action="CREATE"/> <auto-attributes include="pk" mode="IN" optional="true"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="updateSurveyTrigger" default-entity-name="SurveyTrigger" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionType"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="updateSurveyQuestionType"> <description>Update a SurveyTrigger</description> + <permission-service service-name="contentManagerPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> </service> <service name="deleteSurveyTrigger" default-entity-name="SurveyTrigger" auth="true" engine="simple" - location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyTrigger"> + location="org/ofbiz/content/survey/SurveyServices.xml" invoke="deleteSurveyTrigger"> <description>Delete SurveyTrigger</description> + <permission-service service-name="contentManagerPermission" main-action="DELETE"/> <auto-attributes include="pk" mode="IN" optional="false"/> </service> @@ -262,7 +296,7 @@ <override name="surveyId" mode="INOUT" optional="false"/> </service> - <service name="surveyResponseProcessInterface" engine="interface" location="" invoke=""> + <service name="surveyResponseProcessInterface" engine="interface"> <description>Interface for Survey Response Processing services defined on the Survey</description> <attribute name="surveyResponseId" type="String" mode="IN" optional="false"/> </service> @@ -322,21 +356,5 @@ <description>Build Pdf From Survey Response</description> <attribute name="surveyResponseId" type="String" mode="IN" optional="false" /> <attribute name="outByteWrapper" type="org.ofbiz.entity.util.ByteWrapper" mode="OUT" optional="false" /> - </service> - - <!-- - <service name="persistSurveyContent" engine="java" - transaction-timeout="72000" - location="org.ofbiz.content.ContentManagementServices" invoke="persistSurveyContent" auth="true"> - <implements service="createSurveyResponse"/> - - </service> - - <service name="persistSurveyContentWithRevision" engine="java" - transaction-timeout="72000" - location="org.ofbiz.content.ContentManagementServices" invoke="persistSurveyContentWithRevision" auth="true"> - <implements service="persistSurveyContent"/> - <attribute mode="IN" name="masterRevisionContentId" optional="false" type="String"/> - </service> - --> + </service> </services> Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementEvents.java Mon Feb 19 11:53:06 2007 @@ -310,7 +310,7 @@ if (!statusIdUpdated) { try { GenericValue targContent = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", targContentId)); - targContent.set("statusId", "BLOG_PUBLISHED"); + targContent.set("statusId", "CTNT_PUBLISHED"); targContent.store(); statusIdUpdated = true; } catch(GenericEntityException e) { Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java Mon Feb 19 11:53:06 2007 @@ -51,27 +51,27 @@ public static Map generateBlogRssFeed(DispatchContext dctx, Map context) { GenericValue userLogin = (GenericValue) context.get("userLogin"); - String caContentId = (String) context.get("caContentId"); + String contentId = (String) context.get("blogContentId"); String entryLink = (String) context.get("entryLink"); String feedType = (String) context.get("feedType"); Locale locale = (Locale) context.get("locale"); // create the main link String mainLink = (String) context.get("mainLink"); - mainLink = mainLink + "?caContentId=" + caContentId + "&ownerContentId=" + caContentId; + mainLink = mainLink + "?blogContentId=" + contentId; GenericDelegator delegator = dctx.getDelegator(); // get the main blog content GenericValue content = null; try { - content = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", caContentId)); + content = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentId)); } catch (GenericEntityException e) { Debug.logError(e, module); } if (content == null) { - return ServiceUtil.returnError("Not able to generate RSS feed for content: " + caContentId); + return ServiceUtil.returnError("Not able to generate RSS feed for content: " + contentId); } // create the feed @@ -81,7 +81,7 @@ feed.setTitle(content.getString("contentName")); feed.setDescription(content.getString("description")); - feed.setEntries(generateEntryList(delegator, caContentId, entryLink, locale, userLogin)); + feed.setEntries(generateEntryList(delegator, contentId, entryLink, locale, userLogin)); Map resp = ServiceUtil.returnSuccess(); resp.put("wireFeed", feed.createWireFeed()); @@ -95,7 +95,7 @@ List exprs = FastList.newInstance(); exprs.add(new EntityExpr("contentIdStart", EntityOperator.EQUALS, contentId)); exprs.add(new EntityExpr("caContentAssocTypeId", EntityOperator.EQUALS, "PUBLISH_LINK")); - exprs.add(new EntityExpr("statusId", EntityOperator.EQUALS, "BLOG_PUBLISHED")); + exprs.add(new EntityExpr("statusId", EntityOperator.EQUALS, "CTNT_PUBLISHED")); List contentRecs = null; try { @@ -117,7 +117,7 @@ Debug.logError(e, module); } if (sub != null) { - String thisLink = entryLink + "?articleContentId=" + v.getString("contentId") + "&ownerContentId=" + contentId; + String thisLink = entryLink + "?articleContentId=" + v.getString("contentId") + "&blogContentId=" + contentId; SyndContent desc = new SyndContentImpl(); desc.setType("text/plain"); desc.setValue(sub); @@ -126,9 +126,8 @@ entry.setTitle(v.getString("contentName")); entry.setPublishedDate(v.getTimestamp("createdDate")); entry.setDescription(desc); - entry.setLink(thisLink); - // TODO: set author(s) - + entry.setLink(thisLink); + entry.setAuthor((v.getString("createdByUserLogin"))); entries.add(entry); } } Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentPermissionServices.java Mon Feb 19 11:53:06 2007 @@ -89,7 +89,8 @@ * associated with the ownerContent entity. */ public static Map checkContentPermission(DispatchContext dctx, Map context) { - + Debug.logWarning(new Exception(), "This service has been depricated in favor of [genericContentPermission]", module); + Security security = dctx.getSecurity(); GenericDelegator delegator = dctx.getDelegator(); String statusId = (String) context.get("statusId"); Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java (original) +++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServices.java Mon Feb 19 11:53:06 2007 @@ -1028,14 +1028,10 @@ Map result = new HashMap(); GenericValue content = (GenericValue)context.get("content"); - GenericValue userLogin = (GenericValue)context.get("userLogin"); - Security security = dctx.getSecurity(); - if (!security.hasEntityPermission("CONTENTMGR", "_ADMIN", userLogin)) { - return ServiceUtil.returnError("Permission denied."); - } + GenericValue userLogin = (GenericValue)context.get("userLogin"); try { - content.put("statusId", "BLOG_PUBLISHED"); + content.put("statusId", "CTNT_PUBLISHED"); content.store(); } catch(GenericEntityException e) { Debug.logError(e.getMessage(), module); Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl Mon Feb 19 11:53:06 2007 @@ -337,7 +337,7 @@ <input type="hidden" name="contentIdTo_o_${rowCount}" value="${subContentId}" /> <input type="hidden" name="contentId_o_${rowCount}" value="${contentId}" /> <input type="hidden" name="contentAssocTypeId_o_${rowCount}" value="PUBLISH_LINK" /> - <input type="hidden" name="statusId_o_${rowCount}" value="BLOG_SUBMITTED" /> + <input type="hidden" name="statusId_o_${rowCount}" value="CTNT_IN_PROGRESS" /> </tr> <#assign rowCount = rowCount + 1 /> <@publishContent forumId=subContentId contentId=contentId indentIndex=(indentIndex + 1)/> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl Mon Feb 19 11:53:06 2007 @@ -169,15 +169,15 @@ </td> <td class="tabletext"> <b>submitted:</b> - <input type="radio" name="statusId_o_${row}" value="BLOG_SUBMITTED" checked/> + <input type="radio" name="statusId_o_${row}" value="CTNT_FINAL_DRAFT" checked/> </td> <td class="tabletext"> <b>publish:</b> - <input type="radio" name="statusId_o_${row}" value="BLOG_PUBLISHED"/> + <input type="radio" name="statusId_o_${row}" value="CTNT_PUBLISHED"/> </td> <td class="tabletext"> <b>reject:</b> - <input type="radio" name="statusId_o_${row}" value="BLOG_REJECTED"/> + <input type="radio" name="statusId_o_${row}" value="CTNT_DEACTIVATED"/> </td> </tr> <input type="hidden" name="contentId_o_${row}" value="${content.contentId}"/> Modified: ofbiz/trunk/applications/content/webapp/content/cms/addSubSite.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/addSubSite.ftl?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/addSubSite.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/addSubSite.ftl Mon Feb 19 11:53:06 2007 @@ -40,9 +40,9 @@ <td align="right">Posted Msg Default Status:</td> <td align="left"> <select name="statusId"> - <option value="BLOG_DRAFT">Draft - not attached to any site</option> - <option value="BLOG_SUBMITTED">Submitted - but must be approve (moderated)</option> - <option value="BLOG_PUBLISHED">Publish immediately</option> + <option value="CTNT_IN_PROGRESS">Draft - not attached to any site</option> + <option value="CTNT_FINAL_DRAFT">Final Draft - but must be approve (moderated)</option> + <option value="CTNT_PUBLISHED">Publish immediately</option> </select> </td> </tr> Modified: ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh (original) +++ ofbiz/trunk/applications/content/widget/cms/mostrecentprep.bsh Mon Feb 19 11:53:06 2007 @@ -68,7 +68,7 @@ exprList.add(thruExpr2); //contentAssocTypeExpr = new EntityExpr("caContentAssocTypeId", EntityOperator.EQUALS, "RESPONSE"); //exprList.add(contentAssocTypeExpr); - statusIdExpr = new EntityExpr("statusId", EntityOperator.EQUALS, "BLOG_SUBMITTED"); + statusIdExpr = new EntityExpr("statusId", EntityOperator.EQUALS, "CTNT_IN_PROGRESS"); exprList.add(statusIdExpr); contentIdToExpr = new EntityExpr("caContentIdTo", EntityOperator.EQUALS, forumId); exprList.add(contentIdToExpr); Modified: ofbiz/trunk/applications/ecommerce/data/DemoBlogEntryData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/data/DemoBlogEntryData.xml?view=diff&rev=509321&r1=509320&r2=509321 ============================================================================== --- ofbiz/trunk/applications/ecommerce/data/DemoBlogEntryData.xml (original) +++ ofbiz/trunk/applications/ecommerce/data/DemoBlogEntryData.xml Mon Feb 19 11:53:06 2007 @@ -18,29 +18,29 @@ under the License. --> <entity-engine-xml> - <DataResource dataResourceId="BLG10000" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" dataResourceName="Float left" mimeTypeId="text/html" objectInfo="component://ecommerce/widget/blog/BlogTemplates.xml#FloatLeft" createdDate="2004-01-16 01:24:06.522" createdByUserLogin="admin" lastModifiedDate="2007-01-23 16:46:38.468" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:38.468" lastUpdatedTxStamp="2007-01-23 16:46:37.359" createdStamp="2007-01-23 16:46:22.421" createdTxStamp="2007-01-23 16:46:21.406"/> - <DataResource dataResourceId="BLG10001" dataResourceTypeId="OFBIZ_FILE_BIN" dataTemplateTypeId="NONE" statusId="BLOG_DRAFT" mimeTypeId="image/jpeg" objectInfo="/applications/ecommerce/data/cutekid.jpg" isPublic="Y" createdDate="2007-01-23 16:46:22.843" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:22.843" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:22.843" lastUpdatedTxStamp="2007-01-23 16:46:21.406" createdStamp="2007-01-23 16:46:22.843" createdTxStamp="2007-01-23 16:46:21.406"/> - <DataResource dataResourceId="BLG10002" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_DRAFT" createdDate="2007-01-23 16:46:22.984" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:46:38.671" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:46:38.671" lastUpdatedTxStamp="2007-01-23 16:46:37.359" createdStamp="2007-01-23 16:46:22.984" createdTxStamp="2007-01-23 16:46:21.406"/> - <DataResource dataResourceId="BLG10003" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2007-01-23 16:47:49.343" createdByUserLogin="bigal" lastModifiedDate="2007-01-23 16:47:49.343" lastModifiedByUserLogin="bigal" lastUpdatedStamp="2007-01-23 16:47:49.343" lastUpdatedTxStamp="2007-01-23 16:47:49.328" createdStamp="2007-01-23 16:47:49.343" createdTxStamp="2007-01-23 16:47:49.328"/> - <DataResource dataResourceId="BLG10004" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2007-01-23 16:50:38.171" createdByUserLogin="blog_guest" lastModifiedDate="2007-01-23 16:50:38.171" lastModifiedByUserLogin="blog_guest" lastUpdatedStamp="2007-01-23 16:50:38.187" lastUpdatedTxStamp="2007-01-23 16:50:38.171" createdStamp="2007-01-23 16:50:38.187" createdTxStamp="2007-01-23 16:50:38.171"/> - <DataResource dataResourceId="BLG10005" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" createdDate="2007-01-23 16:52:11.421" createdByUserLogin="blog_guest" lastModifiedDate="2007-01-23 16:52:11.421" lastModifiedByUserLogin="blog_guest" lastUpdatedStamp="2007-01-23 16:52:11.421" lastUpdatedTxStamp="2007-01-23 16:52:11.406" createdStamp="2007-01-23 16:52:11.421" createdTxStamp="2007-01-23 16:52:11.406"/> - <DataResource dataResourceId="BLG10006" dataResourceTypeId="ELECTRONIC_TEXT" dataTemplateTypeId="NONE" statusId="BLOG_PUBLISHED" mim |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |