community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing EMM-1779

Browse Source
This commit is contained in:
Megala 2016-10-25 17:34:53 +05:30
parent 00be80eb2a
commit e23ecc5b64
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java
View File

@ -1072,7 +1072,7 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
private static void validateScheduleDate(String dateString){ private static void validateScheduleDate(String dateString){
try { try {
if (dateString != null) { if (dateString != null && !dateString.isEmpty()) {
SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT); SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
sdf.setLenient(false); sdf.setLenient(false);
sdf.parse(dateString); sdf.parse(dateString);

4
components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.operation-bar/public/templates/operations.hbs
View File

@ -205,7 +205,7 @@
showDropdowns: true, showDropdowns: true,
timePickerIncrement: 1, timePickerIncrement: 1,
locale: { locale: {
format: 'MM-DD-YYYY hh:mm a' format: "YYYY-MM-DDTHH:mm:ssZZ"
} }
}); });
}); });
@ -222,7 +222,7 @@
showDropdowns: true, showDropdowns: true,
timePickerIncrement: 1, timePickerIncrement: 1,
locale: { locale: {
format: 'MM-DD-YYYY hh:mm a' format: "YYYY-MM-DDTHH:mm:ssZZ"
} }
}); });
} }