inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/V2.3 to HEAD:

Browse Source 
112606: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        97445: (RECORD ONLY) RM-1932 Changed the notification frequency based on 2.3 code changes
   112629: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        99084: (RECORD ONLY) Merged V2.3 to V2.2 :
             93334: RM-1822 (Non-system-admin user not allowed to read inheritable permissions)
        99085: (RECORD ONLY) Merged V2.3 to V2.2:
             92881: RM-1799 (Root category is not displayed for the non-rm-admin user who created it)
        99086: (RECORD ONLY) Merged V2.3 to V2.2:
             96580: RM-1904 (SubCategory moved to root have inheritance on)
   112663: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        99087: Upgrade Alfresco version to 4.2.4.6
        99088: RM-2026: Unable to complete historical records when mandatory meta-data missing
        99089: Merged HEAD to V2.2:
             89735: RM-1677- No items error for RM Admin if record was declared from moderated/private site
   112665: Fix merge - delete duplicate method.
   112694: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        98839: GERMAN: Updated bundle for RM 2.2.1 based on EN-rev98763
        98840: SPANISH: Updated bundle for RM 2.2.1 based on EN-rev98763
        98841: FRENCH: Updated bundle for RM 2.2.1 based on EN-rev98763
        98842: ITALIAN: Updated bundle for RM 2.2.1 based on EN-rev98763
        98843: JAPANESE: Updated bundle for RM 2.2.1 based on EN-rev98763
        98844: DUTCH: Updated bundle for RM 2.2.1 based on EN-rev98763
        98845: RUSSIAN: Updated bundle for RM 2.2.1 based on EN-rev98763
        98846: BRAZILIAN PORTUGUESE: Updated bundle for RM 2.2.1 based on EN-rev98763
        98847: SIMPLIFIED CHINESE: Updated bundle for RM 2.2.1 based on EN-rev98763
        98848: BRAZILIAN PORTUGUESE: Updated file and remove of wrongly named file for RM 2.2.1 based on EN-rev98763
        98849: ALL LANG: remove file that does not need to be localised
   112700: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        99374: (RECORD ONLY) Merged V2.3 to V2.1.1:
             96823: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
             97435: RM-1903: Can't manage permissions without "Manage Access Controls" capability
             97436: RM-1903 - updates to unit tests
             97595: RM-1903 (Can't manage permissions without "Manage Access Controls" capability)
        111023: RM-2566 : [RM] Incorrect message appears on the "Requested information" text box
             - replaced <constraint type="Mandatory"> with mandatory="true"
        112550: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
             112549: Update module version to 2.1.2 after merge of hot fix branch.
        112668: Merged BRANCHES/V2.1 to BRANCHES/V2.2:
             70625: (RECORD ONLY) Added JIRA-Ticket Info
             71381: (RECORD ONLY) Fixed RM 2.1 to get it working with Alfresco 4.2.2
   112951: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
        112947: RM-2617 Remove duplicate token from end of localised strings.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@112953 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-09-24 09:35:52 +00:00
parent a859db84c9 a430552d7b
commit 6dcac97e37
10 changed files with 271 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/DeclareRecordAction.java
View File

@@ -54,6 +54,17 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
/** Logger */
private static Log logger = LogFactory.getLog(DeclareRecordAction.class);
/** check mandatory properties */
private boolean checkMandatoryPropertiesEnabled = true;
/**
* @param checkMandatoryPropertiesEnabled true if check mandatory properties is enabled, false otherwise
*/
public void setCheckMandatoryPropertiesEnabled(boolean checkMandatoryPropertiesEnabled)
{
this.checkMandatoryPropertiesEnabled = checkMandatoryPropertiesEnabled;
}
/**
* @see org.alfresco.repo.action.executer.ActionExecuterAbstractBase#executeImpl(org.alfresco.service.cmr.action.Action, org.alfresco.service.cmr.repository.NodeRef)
@@ -69,7 +80,8 @@ public class DeclareRecordAction extends RMActionExecuterAbstractBase
{
List<String> missingProperties = new ArrayList<String>(5);
// Aspect not already defined - check mandatory properties then add
if (mandatoryPropertiesSet(actionedUponNodeRef, missingProperties))
if (!checkMandatoryPropertiesEnabled ||
mandatoryPropertiesSet(actionedUponNodeRef, missingProperties))
{
getRecordService().disablePropertyEditableCheck();
try