Author: mrisaliti
Date: Sun Dec 19 17:12:48 2010 New Revision: 1050902 URL: http://svn.apache.org/viewvc?rev=1050902&view=rev Log: Replace some fail-message to fail-property tag in content component (OFBIZ-1874) Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/ContentManagementMapProcessors.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml Modified: ofbiz/trunk/applications/content/config/ContentUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/config/ContentUiLabels.xml?rev=1050902&r1=1050901&r2=1050902&view=diff ============================================================================== --- ofbiz/trunk/applications/content/config/ContentUiLabels.xml (original) +++ ofbiz/trunk/applications/content/config/ContentUiLabels.xml Sun Dec 19 17:12:48 2010 @@ -87,6 +87,10 @@ <value xml:lang="en">Article Name</value> <value xml:lang="th">à¸à¸·à¹à¸à¸à¸à¸à¸§à¸²à¸¡</value> </property> + <property key="ContentArticleNameIsMissing"> + <value xml:lang="en">Article Name is missing.</value> + <value xml:lang="it">Nome articolo è mancante.</value> + </property> <property key="ContentAttribute"> <value xml:lang="ar">خاصÙØ©</value> <value xml:lang="da">Attribut</value> @@ -447,6 +451,10 @@ <value xml:lang="zh">è¿ååæææ¡£æ ¹ç®å½</value> <value xml:lang="zh_TW">è¿ååæææªæ ¹ç®é</value> </property> + <property key="ContentCompDocInstanceAlreadyExists"> + <value xml:lang="en">Instance compdoc Content for ${parameters.rootInstanceContentId} already exists</value> + <value xml:lang="it">Istanza composizione documenti contenuto per ${parameters.rootInstanceContentId} esiste già </value> + </property> <property key="ContentCompDocParentContentId"> <value xml:lang="da">Forældre inholds id</value> <value xml:lang="en">Parent Content ID</value> @@ -646,6 +654,14 @@ <value xml:lang="zh">å ³èå°è¿ä¸ªæ°æ®èµæºçå 容记å½</value> <value xml:lang="zh_TW">éè¯å°éåè³æè³æºçå §å®¹è¨é</value> </property> + <property key="ContentContentIdOrUploadFileIsMissing"> + <value xml:lang="en">Content Id or Upload file is missing.</value> + <value xml:lang="it">Id contenuto o file da caricare è mancante.</value> + </property> + <property key="ContentCreateDateInvalidFormat"> + <value xml:lang="en">Created Date is not a valid Timestamp input format.</value> + <value xml:lang="it">Data creazione non è nel formato valido.</value> + </property> <property key="ContentCreateFile"> <value xml:lang="da">Opret fil</value> <value xml:lang="de">Datei erstellen</value> @@ -1071,6 +1087,10 @@ <value xml:lang="zh">论å</value> <value xml:lang="zh_TW">è«å£</value> </property> + <property key="ContentFromDateInvalidFormat"> + <value xml:lang="en">fromDate not a valid date format</value> + <value xml:lang="it">Data dal non è nel formato valido.</value> + </property> <property key="ContentGIF"> <value xml:lang="da">GIF</value> <value xml:lang="en">GIF</value> @@ -1189,6 +1209,10 @@ <value xml:lang="fr">JPG</value> <value xml:lang="it">JPEG</value> </property> + <property key="ContentLastModifiedDateInvalidFormat"> + <value xml:lang="en">Last Modified Date is not a valid Timestamp input format.</value> + <value xml:lang="it">Data modifica non è nel formato valido.</value> + </property> <property key="ContentLatest"> <value xml:lang="da">Senest</value> <value xml:lang="en">Latest</value> @@ -1427,6 +1451,10 @@ <value xml:lang="zh">è·¯å¾å«åå表</value> <value xml:lang="zh_TW">è·¯å¾å¥åå表</value> </property> + <property key="ContentPermissionNotGranted"> + <value xml:lang="en">Permission not granted.</value> + <value xml:lang="it">Permesso non abilitato.</value> + </property> <property key="ContentPlainText"> <value xml:lang="da">Klartekst</value> <value xml:lang="en">Plain Text</value> @@ -1561,6 +1589,18 @@ <value xml:lang="zh">æ ¹</value> <value xml:lang="zh_TW">æ ¹</value> </property> + <property key="ContentSecurityCreatePermission"> + <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission</value> + <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso CONTENTMGR_CREATE o CONTENTMGR_ADMIN</value> + </property> + <property key="ContentSecurityDeletPermission"> + <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission</value> + <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso CONTENTMGR_DELETE o CONTENTMGR_ADMIN</value> + </property> + <property key="ContentSecurityUpdatePermission"> + <value xml:lang="en">Security Error: to run ${resourceDescription} you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission</value> + <value xml:lang="it">Errore di sicurezza: per eseguire ${resourceDescription} devi avere il permesso CONTENTMGR_UPDATE o CONTENTMGR_ADMIN</value> + </property> <property key="ContentSoftRejected"> <value xml:lang="da">Soft afvist</value> <value xml:lang="en">Soft Rejected</value> @@ -2097,6 +2137,10 @@ <value xml:lang="zh">æ </value> <value xml:lang="zh_TW">樹</value> </property> + <property key="ContentThruDateInvalidFormat"> + <value xml:lang="en">thruDate not a valid date format</value> + <value xml:lang="it">Data al non è nel formato valido.</value> + </property> <property key="ContentType"> <value xml:lang="da">Indholdstype</value> <value xml:lang="de">Inhalt Typ</value> @@ -2131,6 +2175,10 @@ <value xml:lang="zh">ä½ æ²¡ææµè§æ¬é¡µé¢çæéã(éè¦å ·å¤"CONTENTMGR_UPDATE"æ"CONTENTMGR_ADMIN")</value> <value xml:lang="zh_TW">ä½ æ²æç覽æ¬é é¢çæ¬éã(éè¦å ·å"CONTENTMGR_UPDATE"æ"CONTENTMGR_ADMIN")</value> </property> + <property key="ContentUploadFileTypeNotMatch"> + <value xml:lang="en">Upload file type not match your selected.</value> + <value xml:lang="it">Tipo file da caricare non corrisponde alla tua selezione.</value> + </property> <property key="ContentUploadedFile"> <value xml:lang="da">Uploadet fil</value> <value xml:lang="en">Uploaded File</value> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/ContentManagementMapProcessors.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/ContentManagementMapProcessors.xml?rev=1050902&r1=1050901&r2=1050902&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/ContentManagementMapProcessors.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/ContentManagementMapProcessors.xml Sun Dec 19 17:12:48 2010 @@ -35,13 +35,13 @@ under the License. <process field="characterSetId"><copy to-field="characterSetId" replace="true" set-if-null="false"/></process> <process field="createdDate"> <convert to-field="createdDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="createdDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentCreateDateInvalidFormat"/> </convert> </process> <process field="createdByUserLogin"><copy to-field="createdByUserLogin" replace="true" set-if-null="false"/></process> <process field="lastModifiedDate"> <convert to-field="lastModifiedDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="lastModifiedDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentLastModifiedDateInvalidFormat"/> </convert> </process> <process field="lastModifiedByUserLogin"><copy to-field="lastModifiedByUserLogin" replace="true" set-if-null="false"/></process> @@ -60,13 +60,13 @@ under the License. <process field="drObjectInfo"><copy to-field="objectInfo" replace="true" set-if-null="false"/></process> <process field="drCreatedDate"> <convert to-field="createdDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="drCreatedDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentCreateDateInvalidFormat"/> </convert> </process> <process field="drCreatedByUserLogin"><copy to-field="createdByUserLogin" replace="true" set-if-null="false"/></process> <process field="drLastModifiedDate"> <convert to-field="lastModifiedDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="drLastModifiedDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentLastModifiedDateInvalidFormat"/> </convert> </process> <process field="drLastModifiedByUserLogin"><copy to-field="lastModifiedByUserLogin" replace="true" set-if-null="false"/></process> @@ -77,12 +77,12 @@ under the License. <process field="caContentAssocTypeId"><copy to-field="contentAssocTypeId" replace="true" set-if-null="false"/></process> <process field="caFromDate"> <convert to-field="fromDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="fromDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentFromDateInvalidFormat"/> </convert> </process> <process field="caThruDate"> <convert to-field="thruDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="thruDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentThruDateInvalidFormat"/> </convert> </process> <process field="caContentAssocPredicateId"><copy to-field="contentAssocPredicateId" replace="true" set-if-null="false"/></process> @@ -93,13 +93,13 @@ under the License. <process field="caLeftCoordinate"><copy to-field="leftCoordinate" replace="true" set-if-null="false"/></process> <process field="caCreatedDate"> <convert to-field="createdDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="caCreatedDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentCreateDateInvalidFormat"/> </convert> </process> <process field="caCreatedByUserLogin"><copy to-field="createdByUserLogin" replace="true" set-if-null="false"/></process> <process field="caLastModifiedDate"> <convert to-field="lastModifiedDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="caLastModifiedDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentLastModifiedDateInvalidFormat"/> </convert> </process> <process field="caLastModifiedByUserLogin"><copy to-field="lastModifiedByUserLogin" replace="true" set-if-null="false"/></process> @@ -120,13 +120,13 @@ under the License. <process field="characterSetId"><copy to-field="characterSetId" replace="true" set-if-null="false"/></process> <process field="createdDate"> <convert to-field="createdDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="createdDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentCreateDateInvalidFormat"/> </convert> </process> <process field="createdByUserLogin"><copy to-field="createdByUserLogin" replace="true" set-if-null="false"/></process> <process field="lastModifiedDate"> <convert to-field="lastModifiedDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="lastModifiedDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentLastModifiedDateInvalidFormat"/> </convert> </process> <process field="lastModifiedByUserLogin"><copy to-field="lastModifiedByUserLogin" replace="true" set-if-null="false"/></process> @@ -145,13 +145,13 @@ under the License. <process field="objectInfo"><copy to-field="drObjectInfo" replace="true" set-if-null="false"/></process> <process field="createdDate"> <convert to-field="drCreatedDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="createdDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentCreateDateInvalidFormat"/> </convert> </process> <process field="createdByUserLogin"><copy to-field="drCreatedByUserLogin" replace="true" set-if-null="false"/></process> <process field="lastModifiedDate"> <convert to-field="drLastModifiedDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="lastModifiedDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentLastModifiedDateInvalidFormat"/> </convert> </process> <process field="lastModifiedByUserLogin"><copy to-field="drLastModifiedByUserLogin" replace="true" set-if-null="false"/></process> @@ -162,12 +162,12 @@ under the License. <process field="contentAssocTypeId"><copy to-field="caContentAssocTypeId" replace="true" set-if-null="false"/></process> <process field="fromDate"> <convert to-field="caFromDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="fromDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentFromDateInvalidFormat"/> </convert> </process> <process field="thruDate"> <convert to-field="caThruDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="thruDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentThruDateInvalidFormat"/> </convert> </process> <process field="contentAssocPredicateId"><copy to-field="caContentAssocPredicateId" replace="true" set-if-null="false"/></process> @@ -178,13 +178,13 @@ under the License. <process field="leftCoordinate"><copy to-field="caLeftCoordinate" replace="true" set-if-null="false"/></process> <process field="createdDate"> <convert to-field="caCreatedDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="createdDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentCreateDateInvalidFormat"/> </convert> </process> <process field="createdByUserLogin"><copy to-field="caCreatedByUserLogin" replace="true" set-if-null="false"/></process> <process field="lastModifiedDate"> <convert to-field="caLastModifiedDate" replace="true" set-if-null="false" type="Timestamp"> - <fail-message message="lastModifiedDate not a valid date format"/> + <fail-property resource="ContentUiLabels" property="ContentLastModifiedDateInvalidFormat"/> </convert> </process> <process field="lastModifiedByUserLogin"><copy to-field="caLastModifiedByUserLogin" replace="true" set-if-null="false"/></process> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml?rev=1050902&r1=1050901&r2=1050902&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/blog/BlogServices.xml Sun Dec 19 17:12:48 2010 @@ -33,7 +33,7 @@ <!-- determine of we need to create complex template structure or simple content structure --> <if-empty field="parameters.contentName"> <add-error> - <fail-message message="Article Name is missing."/> + <fail-property resource="ContentUiLabels" property="ContentArticleNameIsMissing"/> </add-error> </if-empty> <check-errors/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml?rev=1050902&r1=1050901&r2=1050902&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml Sun Dec 19 17:12:48 2010 @@ -58,7 +58,7 @@ under the License. </entity-one> <if-not-empty field="existingContent"> <add-error> - <fail-message message="Instance compdoc Content for ${parameters.rootInstanceContentId} already exists"/> + <fail-property resource="ContentUiLabels" property="ContentCompDocInstanceAlreadyExists"/> </add-error> <check-errors/> </if-not-empty> @@ -319,7 +319,7 @@ under the License. <!-- Methods for ContentRevision --> <simple-method method-name="createContentRevision" short-description="Create ContentRevision"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createContentRevision you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="ContentRevision" value-field="newEntity"/> @@ -329,7 +329,7 @@ under the License. </simple-method> <simple-method method-name="updateContentRevision" short-description="Update ContentRevision"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateContentRevision you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <make-value entity-name="ContentRevision" value-field="lookupKeyValue"/> @@ -340,7 +340,7 @@ under the License. </simple-method> <simple-method method-name="removeContentRevision" short-description="Remove ContentRevision"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run removeContentRevision you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletPermission"/> </check-permission> <check-errors/> <make-value entity-name="ContentRevision" value-field="lookupKeyValue"/> @@ -351,7 +351,7 @@ under the License. <!-- Methods for ContentRevisionItem --> <simple-method method-name="createContentRevisionItem" short-description="Create ContentRevisionItem"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createContentRevisionItem you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="ContentRevisionItem" value-field="newEntity"/> @@ -361,7 +361,7 @@ under the License. </simple-method> <simple-method method-name="updateContentRevisionItem" short-description="Update ContentRevisionItem"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateContentRevisionItem you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <make-value entity-name="ContentRevisionItem" value-field="lookupKeyValue"/> @@ -372,7 +372,7 @@ under the License. </simple-method> <simple-method method-name="removeContentRevisionItem" short-description="Remove ContentRevisionItem"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run removeContentRevisionItem you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <make-value entity-name="ContentRevisionItem" value-field="lookupKeyValue"/> @@ -477,7 +477,7 @@ under the License. <simple-method method-name="createContentApproval" short-description="Create ContentApproval"> <log level="always" message="got into createContentApproval(4)"/> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createContentApproval you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="ContentApproval" value-field="newEntity"/> @@ -493,7 +493,7 @@ under the License. <simple-method method-name="updateContentApproval" short-description="Update ContentApproval"> <log level="always" message="got into updateContentApproval(4)"/> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateContentApproval you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <make-value entity-name="ContentApproval" value-field="lookupKeyValue"/> @@ -504,7 +504,7 @@ under the License. </simple-method> <simple-method method-name="removeContentApproval" short-description="Remove ContentApproval"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run removeContentApproval you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <make-value entity-name="ContentApproval" value-field="lookupKeyValue"/> @@ -792,7 +792,7 @@ under the License. <log level="info" message="got into prepForApproval- parameters: ${parameters}"/> <set field="rootContentId" from-field="parameters.rootContentId"/> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run prepForApproval you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <!-- bump CDI up one for new approval --> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml?rev=1050902&r1=1050901&r2=1050902&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentEvents.xml Sun Dec 19 17:12:48 2010 @@ -31,12 +31,12 @@ under the License. <simple-map-processor name="newDateContent"> <process field="createdDate"> <convert type="Timestamp"> - <fail-message message="Created Date is not a valid Timestamp input format."/> + <fail-property resource="ContentUiLabels" property="ContentCreateDateInvalidFormat"/> </convert> </process> <process field="lastModifiedDate"> <convert type="Timestamp"> - <fail-message message="LastModified Date is not a valid Timestamp input format."/> + <fail-property resource="ContentUiLabels" property="ContentLastModifiedDateInvalidFormat"/> </convert> </process> </simple-map-processor> @@ -57,7 +57,7 @@ under the License. </call-service> <if-empty field="contentId"> <add-error> - <fail-message message="Permission not granted."/> + <fail-property resource="ContentUiLabels" property="ContentPermissionNotGranted"/> </add-error> </if-empty> <check-errors/> @@ -95,12 +95,12 @@ under the License. <simple-map-processor name="newDateContent"> <process field="createdDate"> <convert type="Timestamp"> - <fail-message message="Created Date is not a valid Timestamp input format."/> + <fail-property resource="ContentUiLabels" property="ContentCreateDateInvalidFormat"/> </convert> </process> <process field="lastModifiedDate"> <convert type="Timestamp"> - <fail-message message="LastModified Date is not a valid Timestamp input format."/> + <fail-property resource="ContentUiLabels" property="ContentLastModifiedDateInvalidFormat"/> </convert> </process> </simple-map-processor> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml?rev=1050902&r1=1050901&r2=1050902&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentPermissionEvents.xml Sun Dec 19 17:12:48 2010 @@ -47,7 +47,7 @@ under the License. <if-compare field="permissionStatus" operator="not-equals" type="String" value="granted"> <add-error> - <fail-message message="Permission not granted."/> + <fail-property resource="ContentUiLabels" property="ContentPermissionNotGranted"/> </add-error> </if-compare> <check-errors/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml?rev=1050902&r1=1050901&r2=1050902&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/content/ContentServices.xml Sun Dec 19 17:12:48 2010 @@ -583,7 +583,7 @@ <!-- Generic content services --> <simple-method method-name="createEmailContent" short-description="Create Email as Content"> <check-permission permission="CONTENTMGR" action="_CREATE"> - <fail-message message="Security Error: to run createContentEmail you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> @@ -626,7 +626,7 @@ </simple-method> <simple-method method-name="updateEmailContent" short-description="Update Email Content"> <check-permission permission="CONTENTMGR" action="_UPDATE"> - <fail-message message="Security Error: to run updateContentEmail you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> @@ -649,7 +649,7 @@ <simple-method method-name="createDownloadContent" short-description="Create Download as Content"> <check-permission permission="CONTENTMGR" action="_CREATE"> - <fail-message message="Security Error: to run createContentEmail you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> @@ -664,7 +664,7 @@ </simple-method> <simple-method method-name="updateDownloadContent" short-description="Update Download Content"> <check-permission permission="CONTENTMGR" action="_UPDATE"> - <fail-message message="Security Error: to run updateContentEmail you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> @@ -677,7 +677,7 @@ <simple-method method-name="createSimpleTextContent" short-description="Create Simple Text Content"> <check-permission permission="CONTENTMGR" action="_CREATE"> - <fail-message message="Security Error: to run createSimpleTextContent you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> @@ -703,7 +703,7 @@ </simple-method> <simple-method method-name="updateSimpleTextContent" short-description="Update Simple Text Content"> <check-permission permission="CONTENTMGR" action="_UPDATE"> - <fail-message message="Security Error: to run updateSimpleTextContent you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> @@ -772,7 +772,9 @@ <simple-method method-name="createCommContentDataResource" short-description="Create CommunicationEvent and Content"> <!-- - <check-permission permission="CONTENTMGR" action="_DELETE"><fail-message message="Security Error: to run updateContent you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/></check-permission> + <check-permission permission="CONTENTMGR" action="_DELETE"> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> + </check-permission> <check-errors/> --> @@ -815,7 +817,9 @@ <simple-method method-name="updateCommContentDataResource" short-description="Update CommunicationEvent and Content"> <!-- - <check-permission permission="CONTENTMGR" action="_DELETE"><fail-message message="Security Error: to run updateContent you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/></check-permission> + <check-permission permission="CONTENTMGR" action="_DELETE"> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> + </check-permission> <check-errors/> --> <set-service-fields to-map="persistIn" service-name="persistContentAndAssoc" map="parameters"/> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml?rev=1050902&r1=1050901&r2=1050902&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/layout/LayoutEvents.xml Sun Dec 19 17:12:48 2010 @@ -42,7 +42,7 @@ under the License. </call-service> <if-empty field="contentId"> <add-error> - <fail-message message="Permission not granted."/> + <fail-property resource="ContentUiLabels" property="ContentPermissionNotGranted"/> </add-error> </if-empty> <check-errors/> @@ -68,7 +68,7 @@ under the License. </call-service> <if-compare field="permissionStatus" operator="not-equals" value="granted" type="String"> <add-error> - <fail-message message="Permission not granted."/> + <fail-property resource="ContentUiLabels" property="ContentPermissionNotGranted"/> </add-error> </if-compare> <check-errors/> @@ -342,7 +342,7 @@ under the License. </condition> <then> <add-error> - <fail-message message="Content Id or Upload file is missing."/> + <fail-property resource="ContentUiLabels" property="ContentContentIdOrUploadFileIsMissing"/> </add-error> </then> </if> @@ -371,7 +371,7 @@ under the License. </then> <else> <add-error> - <fail-message message="Upload file type not match your selected."/> + <fail-property resource="ContentUiLabels" property="ContentUploadFileTypeNotMatch"/> </add-error> </else> </if> Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml?rev=1050902&r1=1050901&r2=1050902&view=diff ============================================================================== --- ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml (original) +++ ofbiz/trunk/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml Sun Dec 19 17:12:48 2010 @@ -23,7 +23,7 @@ <!-- Methods for Survey --> <simple-method method-name="createSurvey" short-description="Create Survey"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurvey you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="Survey" value-field="newEntity"/> @@ -34,7 +34,7 @@ </simple-method> <simple-method method-name="updateSurvey" short-description="Update Survey"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurvey you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <entity-one entity-name="Survey" value-field="lookedUpValue"/> @@ -43,7 +43,7 @@ </simple-method> <simple-method method-name="deleteSurvey" short-description="Delete Survey"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyt you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="Survey" value-field="lookedUpValue"/> @@ -53,7 +53,7 @@ <!-- Methods for SurveyMultiResp --> <simple-method method-name="createSurveyMultiResp" short-description="Create Survey Multi-Response"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurveyMultiResp you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="SurveyMultiResp" value-field="newEntity"/> @@ -66,7 +66,7 @@ </simple-method> <simple-method method-name="updateSurveyMultiResp" short-description="Update Survey Multi-Response"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurveyMultiResp you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyMultiResp" value-field="lookedUpValue"/> @@ -75,7 +75,7 @@ </simple-method> <simple-method method-name="deleteSurveyMultiResp" short-description="Delete Survey Multi-Response"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyMultiResp you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyMultiResp" value-field="lookedUpValue"/> @@ -85,7 +85,7 @@ <!-- Methods for SurveyMultiRespColumn --> <simple-method method-name="createSurveyMultiRespColumn" short-description="Create Survey Multi-Response Column/Category"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurveyMultiRespColumn you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="SurveyMultiRespColumn" value-field="newEntity"/> @@ -96,7 +96,7 @@ </simple-method> <simple-method method-name="updateSurveyMultiRespColumn" short-description="Update Survey Multi-Response Column/Category"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurveyMultiRespColumn you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyMultiRespColumn" value-field="lookedUpValue"/> @@ -105,7 +105,7 @@ </simple-method> <simple-method method-name="deleteSurveyMultiRespColumn" short-description="Delete Survey Multi-Response Column/Category"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyMultiRespColumn you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyMultiRespColumn" value-field="lookedUpValue"/> @@ -115,7 +115,7 @@ <!-- Methods for SurveyPage --> <simple-method method-name="createSurveyPage" short-description="Create Survey Page"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurveyPage you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="SurveyPage" value-field="newEntity"/> @@ -126,7 +126,7 @@ </simple-method> <simple-method method-name="updateSurveyPage" short-description="Update Survey Page"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurveyPage you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyPage" value-field="lookedUpValue"/> @@ -135,7 +135,7 @@ </simple-method> <simple-method method-name="deleteSurveyPage" short-description="Delete Survey Page"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyPage you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyPage" value-field="lookedUpValue"/> @@ -145,7 +145,7 @@ <!-- Methods for SurveyApplType --> <simple-method method-name="createSurveyApplType" short-description="Create SurveyApplType"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurveyApplType you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="SurveyApplType" value-field="newEntity"/> @@ -155,7 +155,7 @@ </simple-method> <simple-method method-name="updateSurveyApplType" short-description="Update SurveyApplType"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurveyApplType you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <entity-one entity-name="Survey" value-field="lookedUpValue"/> @@ -164,7 +164,7 @@ </simple-method> <simple-method method-name="deleteSurveyApplType" short-description="Delete SurveyApplType"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyApplType you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyApplType" value-field="lookupKeyValue"/> @@ -174,7 +174,7 @@ <!-- Methods for SurveyQuestion --> <simple-method method-name="createSurveyQuestion" short-description="Create Survey Question"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurveyQuestion you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <if> <condition> @@ -209,7 +209,7 @@ </simple-method> <simple-method method-name="updateSurveyQuestion" short-description="Update Survey Question"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurveyQuestion you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <if> <condition> @@ -240,7 +240,7 @@ </simple-method> <simple-method method-name="deleteSurveyQuestion" short-description="Delete Survey Question"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyQuestion you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyQuestion" value-field="lookedUpValue"/> @@ -250,7 +250,7 @@ <!-- Methods for SurveyQuestionOption --> <simple-method method-name="createSurveyQuestionOption" short-description="Create Survey Question Option"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurveyQuestionOption you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeleteCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="SurveyQuestionOption" value-field="newEntity"/> @@ -262,7 +262,7 @@ </simple-method> <simple-method method-name="updateSurveyQuestionOption" short-description="Update Survey Question Option"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurveyQuestionOption you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyQuestionOption" value-field="lookedUpValue"/> @@ -272,7 +272,7 @@ </simple-method> <simple-method method-name="deleteSurveyQuestionOption" short-description="Delete Survey Question Option"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyQuestionOption you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyQuestionOption" value-field="lookedUpValue"/> @@ -282,7 +282,7 @@ <!-- Methods for SurveyQuestionAppl --> <simple-method method-name="createSurveyQuestionAppl" short-description="Create Survey Question Application"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurveyQuestionAppl you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="SurveyQuestionAppl" value-field="newEntity"/> @@ -295,7 +295,7 @@ </simple-method> <simple-method method-name="updateSurveyQuestionAppl" short-description="Update Survey Question Application"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurveyQuestionAppl you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyQuestionAppl" value-field="lookedUpValue"/> @@ -304,7 +304,7 @@ </simple-method> <simple-method method-name="deleteSurveyQuestionAppl" short-description="Delete Survey Question Application"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyQuestionAppl you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyQuestionAppl" value-field="lookedUpValue"/> @@ -314,7 +314,7 @@ <!-- Methods for SurveyQuestionCategory --> <simple-method method-name="createSurveyQuestionCategory" short-description="Create Survey QuestionCategory"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurveyQuestionCategory you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="SurveyQuestionCategory" value-field="newEntity"/> @@ -325,7 +325,7 @@ </simple-method> <simple-method method-name="updateSurveyQuestionCategory" short-description="Update Survey QuestionCategory"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurveyQuestionCategory you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyQuestionCategory" value-field="lookupKeyValue"/> @@ -334,7 +334,7 @@ </simple-method> <simple-method method-name="deleteSurveyQuestionCategory" short-description="Delete Survey QuestionCategory"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyQuestionCategory you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyQuestionCategory" value-field="lookupKeyValue"/> @@ -344,7 +344,7 @@ <!-- Methods for SurveyQuestionType --> <simple-method method-name="createSurveyQuestionType" short-description="Create SurveyQuestionType"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurveyQuestionType you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="SurveyQuestionType" value-field="newEntity"/> @@ -354,7 +354,7 @@ </simple-method> <simple-method method-name="updateSurveyQuestionType" short-description="Update SurveyQuestionType"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurveyQuestionType you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyQuestionType" value-field="lookupKeyValue"/> @@ -363,7 +363,7 @@ </simple-method> <simple-method method-name="deleteSurveyQuestionType" short-description="Delete SurveyQuestionType"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyQuestionType you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyQuestionType" value-field="lookupKeyValue"/> @@ -373,7 +373,7 @@ <!-- Methods for SurveyTrigger --> <simple-method method-name="createSurveyTrigger" short-description="Create SurveyTrigger"> <check-permission action="_CREATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run createSurveyTrigger you must have the CONTENTMGR_CREATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityCreatePermission"/> </check-permission> <check-errors/> <make-value entity-name="SurveyTrigger" value-field="newEntity"/> @@ -383,7 +383,7 @@ </simple-method> <simple-method method-name="updateSurveyTrigger" short-description="Update SurveyTrigger"> <check-permission action="_UPDATE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run updateSurveyTrigger you must have the CONTENTMGR_UPDATE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityUpdatePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyTrigger" value-field="lookedUpValue"/> @@ -392,7 +392,7 @@ </simple-method> <simple-method method-name="deleteSurveyTrigger" short-description="Delete SurveyTrigger"> <check-permission action="_DELETE" permission="CONTENTMGR"> - <fail-message message="Security Error: to run deleteSurveyTrigger you must have the CONTENTMGR_DELETE or CONTENTMGR_ADMIN permission"/> + <fail-property resource="ContentUiLabels" property="ContentSecurityDeletePermission"/> </check-permission> <check-errors/> <entity-one entity-name="SurveyTrigger" value-field="lookedUpValue"/> @@ -404,7 +404,9 @@ <!-- lookup the survey --> <entity-one entity-name="Survey" value-field="survey" use-cache="true"/> <if-empty field="survey"> - <add-error><fail-message message="No survey found for survey ID: ${surveyLookup.surveyId}"/></add-error> + <add-error> + <fail-message message="No survey found for survey ID: ${surveyLookup.surveyId}"/> + </add-error> <check-errors/> </if-empty> |
Free forum by Nabble | Edit this page |