ravindu
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #387 from Megala21/master

Browse Source 
Fixing EMM-1779
revert-dabc3590
Harshan Liyanage 8 years ago committed by GitHub
parent ce6a66a1d6 fcdce211b7
commit 4fdc358786
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

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
Unescape 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
Unescape 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"
} }
}); });
} }

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

@ -870,8 +870,8 @@
</div> </div>
<div class="wr-input-control" id="control-wifi-password" style="display:none;"> <div class="wr-input-control" id="control-wifi-password" style="display:none;">
<label class="wr-input-label" for="wifi-password"> <label class="wr-input-label" for="wifi-password">
Password* Password
<span class="helper" title="Password for the wireless network."> <span class="helper required" title="Password for the wireless network.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
</label> </label>

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

@ -906,8 +906,8 @@
</div> </div>
<div class="wr-input-control" id="control-wifi-password" style="display:none;"> <div class="wr-input-control" id="control-wifi-password" style="display:none;">
<label class="wr-input-label" for="wifi-password"> <label class="wr-input-label" for="wifi-password">
Password* Password
<span class="helper" title="Password for the wireless network."> <span class="helper required" title="Password for the wireless network.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
</label> </label>

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

@ -866,8 +866,8 @@
</div> </div>
<div class="wr-input-control" id="control-wifi-password" style="display:none;"> <div class="wr-input-control" id="control-wifi-password" style="display:none;">
<label class="wr-input-label" for="wifi-password"> <label class="wr-input-label" for="wifi-password">
Password* Password
<span class="helper" title="Password for the wireless network."> <span class="helper required" title="Password for the wireless network.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
</label> </label>

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

@ -335,8 +335,8 @@
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="wifi-password"> <label class="wr-input-label" for="wifi-password">
Password* Password
<span class="helper" title="Password for the wireless network."> <span class="helper required" title="Password for the wireless network.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
</label> </label>

Write Preview
Loading…
Cancel
Save