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

Merge branch 'master' into 'master'

Browse Source 
configure display lock timeout

See merge request entgra/carbon-device-mgt-plugins!135
revert-dabc3590
Inosh Perara 5 years ago
parent a704b0da66 1ad144469f
commit c796ba70aa
4 changed files with 96 additions and 23 deletions
Show Stats Download Patch File Download Diff File

45
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js
Unescape View File

@ -133,19 +133,19 @@ var androidOperationModule = function () {
"passcodePolicyMinComplexChars": operationPayload["minComplexChars"],
"passcodePolicyMaxPasscodeAgeInDays": operationPayload["maxPINAgeInDays"],
"passcodePolicyPasscodeHistory": operationPayload["pinHistory"],
"passcodePolicyMaxFailedAttempts": operationPayload["maxFailedAttempts"]
"passcodePolicyMaxFailedAttempts": operationPayload["maxFailedAttempts"],
"passcodePolicyMaxTimeToLock": operationPayload["maxTimeToLock"],
"passcodePolicyWPExist": operationPayload["passcodePolicyWPExist"]
};
if (operationPayload["passcodePolicyWPExist"] === true) {
payload["passcodePolicyWPExist"] = operationPayload["passcodePolicyWPExist"];
payload["passcodePolicyAllowSimpleWP"] = operationPayload.workProfilePasscode["passcodePolicyAllowSimpleWP"];
payload["passcodePolicyRequireAlphanumericWP"] = operationPayload.workProfilePasscode["passcodePolicyRequireAlphanumericWP"];
payload["passcodePolicyMinLengthWP"] = operationPayload.workProfilePasscode["passcodePolicyMinLengthWP"];
payload["passcodePolicyMinComplexCharsWP"] = operationPayload.workProfilePasscode["passcodePolicyMinComplexCharsWP"];
payload["passcodePolicyMaxPasscodeAgeInDaysWP"] = operationPayload.workProfilePasscode["passcodePolicyMaxPasscodeAgeInDaysWP"];
payload["passcodePolicyPasscodeHistoryWP"] = operationPayload.workProfilePasscode["passcodePolicyPasscodeHistoryWP"];
payload["passcodePolicyMaxFailedAttemptsWP"] = operationPayload.workProfilePasscode["passcodePolicyMaxFailedAttemptsWP"];
} else {
payload["passcodePolicyWPExist"] = operationPayload["passcodePolicyWPExist"];
payload["passcodePolicyAllowSimpleWP"] = operationPayload.workProfilePasscode["allowSimpleWP"];
payload["passcodePolicyRequireAlphanumericWP"] = operationPayload.workProfilePasscode["requireAlphanumericWP"];
payload["passcodePolicyMinLengthWP"] = operationPayload.workProfilePasscode["minLengthWP"];
payload["passcodePolicyMinComplexCharsWP"] = operationPayload.workProfilePasscode["minComplexCharsWP"];
payload["passcodePolicyMaxPasscodeAgeInDaysWP"] = operationPayload.workProfilePasscode["maxPINAgeInDaysWP"];
payload["passcodePolicyPasscodeHistoryWP"] = operationPayload.workProfilePasscode["pinHistoryWP"];
payload["passcodePolicyMaxFailedAttemptsWP"] = operationPayload.workProfilePasscode["maxFailedAttemptsWP"];
payload["passcodePolicyMaxTimeToLockWP"] = operationPayload.workProfilePasscode["maxTimeToLockWP"];
}
break;
case androidOperationConstants["CAMERA_OPERATION_CODE"]:
@ -522,25 +522,24 @@ var androidOperationModule = function () {
"minComplexChars": operationData["passcodePolicyMinComplexChars"],
"maxPINAgeInDays": operationData["passcodePolicyMaxPasscodeAgeInDays"],
"pinHistory": operationData["passcodePolicyPasscodeHistory"],
"maxFailedAttempts": operationData["passcodePolicyMaxFailedAttempts"]
"maxFailedAttempts": operationData["passcodePolicyMaxFailedAttempts"],
"maxTimeToLock": operationData["passcodePolicyMaxTimeToLock"],
"passcodePolicyWPExist": operationData["passcodePolicyWPExist"]
}
};
workProfilePasscode = {};
if (operationData["passcodePolicyWPExist"] === true) {
payload.operation["passcodePolicyWPExist"] = operationData["passcodePolicyWPExist"];
workProfilePasscode["passcodePolicyAllowSimpleWP"] = operationData["passcodePolicyAllowSimpleWP"];
workProfilePasscode["passcodePolicyRequireAlphanumericWP"] = operationData["passcodePolicyRequireAlphanumericWP"];
workProfilePasscode["passcodePolicyMinLengthWP"] = operationData["passcodePolicyMinLengthWP"];
workProfilePasscode["passcodePolicyMinComplexCharsWP"] = operationData["passcodePolicyMinComplexCharsWP"];
workProfilePasscode["passcodePolicyMaxPasscodeAgeInDaysWP"] = operationData["passcodePolicyMaxPasscodeAgeInDaysWP"];
workProfilePasscode["passcodePolicyPasscodeHistoryWP"] = operationData["passcodePolicyPasscodeHistoryWP"];
workProfilePasscode["passcodePolicyMaxFailedAttemptsWP"] = operationData["passcodePolicyMaxFailedAttemptsWP"] ;
workProfilePasscode["allowSimpleWP"] = operationData["passcodePolicyAllowSimpleWP"];
workProfilePasscode["requireAlphanumericWP"] = operationData["passcodePolicyRequireAlphanumericWP"];
workProfilePasscode["minLengthWP"] = operationData["passcodePolicyMinLengthWP"];
workProfilePasscode["minComplexCharsWP"] = operationData["passcodePolicyMinComplexCharsWP"];
workProfilePasscode["maxPINAgeInDaysWP"] = operationData["passcodePolicyMaxPasscodeAgeInDaysWP"];
workProfilePasscode["pinHistoryWP"] = operationData["passcodePolicyPasscodeHistoryWP"];
workProfilePasscode["maxFailedAttemptsWP"] = operationData["passcodePolicyMaxFailedAttemptsWP"] ;
workProfilePasscode["maxTimeToLockWP"] = operationData["passcodePolicyMaxTimeToLockWP"];
payload.operation.workProfilePasscode = workProfilePasscode;
} else {
payload["passcodePolicyWPExist"] = operationData["passcodePolicyWPExist"];
}
break;
break;
case androidOperationConstants["APPLICATION_OPERATION_CODE"]:
payload = {
"operation": {

25
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
Unescape View File

@ -339,6 +339,18 @@
</select>
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="passcode-policy-max-time-to-lock">
Time to auto lock seconds*
<span class="helper" title="Time it takes lock a device automatially when idle">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
<br>
</label>
<input id="passcode-policy-max-time-to-lock" type="text" class="form-control operationDataKeys"
data-key="passcodePolicyMaxTimeToLock" >
</div>
<!--Passcode policy for work profile only-->
<h2 class="sub-title panel-title">Passcode policy for work profile</h2>
<div class="wr-input-control">
@ -477,6 +489,19 @@
</select>
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="wp-passcode-policy-max-time-to-lock">
Time to auto lock seconds*
<span class="helper" title="Time it takes lock a device automatially when idle">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
<br>
</label>
<input id="wp-passcode-policy-max-time-to-lock" type="text" class="form-control
operationDataKeys"
data-key="passcodePolicyMaxTimeToLockWP" >
</div>
</div>
</div>
</div>

25
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
Unescape View File

@ -321,6 +321,18 @@
</select>
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="passcode-policy-max-time-to-lock">
Time to auto lock seconds*
<span class="helper" title="Time it takes lock a device automatially when idle">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
<br>
</label>
<input id="passcode-policy-max-time-to-lock" type="text" class="form-control operationDataKeys"
data-key="passcodePolicyMaxTimeToLock" disabled>
</div>
<!--Passcode policy for work profile only-->
<h2 class="sub-title panel-title">Passcode policy for work profile</h2>
<div class="wr-input-control">
@ -458,6 +470,19 @@
<option value="10">10</option>
</select>
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="wp-passcode-policy-max-time-to-lock">
Time to auto lock seconds*
<span class="helper" title="Time it takes lock a device automatially when idle">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
<br>
</label>
<input id="wp-passcode-policy-max-time-to-lock" type="text" class="form-control
operationDataKeys"
data-key="passcodePolicyMaxTimeToLockWP" disabled>
</div>
</div>
</div>
</div>

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

@ -347,6 +347,18 @@
</select>
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="passcode-policy-max-time-to-lock">
Time to auto lock seconds*
<span class="helper" title="Time it takes lock a device automatially when idle">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
<br>
</label>
<input id="passcode-policy-max-time-to-lock" type="text" class="form-control operationDataKeys"
data-key="passcodePolicyMaxTimeToLock" >
</div>
<!--Passcode policy for work profile only-->
<h2 class="sub-title panel-title">Passcode policy for work profile</h2>
<div class="wr-input-control">
@ -485,6 +497,18 @@
</select>
</div>
<div class="wr-input-control">
<label class="wr-input-label" for="wp-passcode-policy-max-time-to-lock">
Time to auto lock seconds*
<span class="helper" title="Time it takes lock a device automatially when idle">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
<br>
</label>
<input id="wp-passcode-policy-max-time-to-lock" type="text" class="form-control
operationDataKeys"
data-key="passcodePolicyMaxTimeToLockWP" >
</div>
</div>
</div>
</div>

Write Preview
Loading…
Cancel
Save