CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merging 1.17.1 into develop

Browse Source
This commit is contained in:
Vishwas Babu A J
2014-02-23 16:40:15 -08:00
parent 6ef342a486 219bd33adf
commit 6653dae41b
5 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientApiConstants.java
+9 -4
View File
@@ -43,9 +43,14 @@ public class ClientApiConstants {
public static final String hierarchyParamName = "hierarchy";
public static final String displayNameParamName = "displayName";
public static final String officeNameParamName = "officeName";
public static final String staffNameParamName = "staffName";
public static final String trasnferOfficeNameParamName = "transferOfficeName";
public static final String transferToOfficeNameParamName = "transferToOfficeName";
public static final String transferToOfficeIdParamName = "transferToOfficeId";
public static final String imageKeyParamName = "imageKey";
public static final String imageIdParamName = "imageId";
public static final String imagePresentParamName = "imagePresent";
public static final String timelineParamName = "timeline";
// associations related part of response
public static final String groupsParamName = "groups";
@@ -69,10 +74,10 @@ public class ClientApiConstants {
* match those of request parameters.
*/
public static final Set<String> CLIENT_RESPONSE_DATA_PARAMETERS = new HashSet<String>(Arrays.asList(idParamName, accountNoParamName,
externalIdParamName, mobileNoParamName, statusParamName, activeParamName, activationDateParamName, firstnameParamName, middlenameParamName,
lastnameParamName, fullnameParamName, displayNameParamName, officeIdParamName, officeNameParamName, transferOfficeIdParamName,
trasnferOfficeNameParamName, hierarchyParamName, imageKeyParamName, imagePresentParamName, groupsParamName,
officeOptionsParamName, staffOptionsParamName));
externalIdParamName, statusParamName, activeParamName, activationDateParamName, firstnameParamName, middlenameParamName,
lastnameParamName, fullnameParamName, displayNameParamName, mobileNoParamName, officeIdParamName, officeNameParamName,
transferToOfficeIdParamName, transferToOfficeNameParamName, hierarchyParamName, imageIdParamName, imagePresentParamName,
staffIdParamName, staffNameParamName, timelineParamName, groupsParamName, officeOptionsParamName, staffOptionsParamName));
public static final Set<String> ACTIVATION_REQUEST_DATA_PARAMETERS = new HashSet<String>(Arrays.asList(localeParamName,
dateFormatParamName, activationDateParamName));
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/data/ClientDataValidator.java
-2
View File
@@ -261,8 +261,6 @@ public final class ClientDataValidator {
baseDataValidator.reset().parameter(ClientApiConstants.idParamName).failWithCode(".no.name.details.passed");
}
} else {
baseDataValidator.reset().parameter(ClientApiConstants.idParamName).failWithCode(".no.name.details.passed");
}
}