ruwin
/
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' of https://github.com/wso2/carbon-device-mgt-plugins

Browse Source
revert-dabc3590
dilanua 8 years ago
parent 00448814e8 552dea0498
commit 712f62aa43
2 changed files with 139 additions and 95 deletions
Show Stats Download Patch File Download Diff File

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

@ -840,6 +840,24 @@ var operationModule = function () {
"restrictedApplications": operationPayload["restricted-applications"] "restrictedApplications": operationPayload["restricted-applications"]
}; };
break; break;
case androidOperationConstants["SYSTEM_UPDATE_POLICY_CODE"]:
if (operationPayload["type"] != "window") {
payload = {
"cosuSystemUpdatePolicyType": operationPayload["type"]
};
} else {
payload = {
"cosuSystemUpdatePolicyType": operationPayload["type"],
"cosuSystemUpdatePolicyWindowStartTime": operationPayload["startTime"],
"cosuSystemUpdatePolicyWindowEndTime": operationPayload["endTime"]
};
}
break;
case androidOperationConstants["KIOSK_APPS_CODE"]:
payload = {
"cosuWhitelistedApplications": operationPayload["whitelistedApplications"]
};
break;
} }
return payload; return payload;
}; };

170
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.hbs
Unescape View File

@ -97,6 +97,24 @@
<!--</span>--> <!--</span>-->
<!--Web clips--> <!--Web clips-->
<!--</a>--> <!--</a>-->
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
<span class="wr-hidden-operation-icon fw-stack">
<i class="fw fw-import fw-stack-2x"></i>
</span>
&nbsp;&nbsp;System Update Policy (COSU)
<span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
<span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
<span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
</a>
<a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelist-applications', this)">
<span class="wr-hidden-operations-icon fw-stack">
<i class="fw fw-register fw-stack-2x"></i>
</span>
Whitelist Apps (COSU)
<span id="cosu-whitelist-applications-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
<span id="cosu-whitelist-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
<span id="cosu-whitelist-applications-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
</a>
</div> </div>
<div class="wr-hidden-operations-content col-lg-8"> <div class="wr-hidden-operations-content col-lg-8">
@ -1298,88 +1316,91 @@
</div> </div>
</div> </div>
<!--android-for-work-cosu--> <!-- cosu-system-update-policy -->
<div class="wr-hidden-operation" data-operation="android-for-work-cosu"> <div class="wr-hidden-operation" data-operation="cosu-system-update-policy">
<!--system-update-policy--> <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy"
<div class="panel panel-default operation-data" data-operation="android-for-work-cosu"
data-operation-code="SYSTEM_UPDATE_POLICY"> data-operation-code="SYSTEM_UPDATE_POLICY">
<div id="system-update-policy-heading" class="panel-heading" role="tab"> <div id="cosu-system-update-policy-heading" class="panel-heading" role="tab">
<h2 class="sub-title panel-title"> <h2 class="sub-title panel-title">
System Update Policy System Update Policy (COSU)
<label id="system-update-policy-lbl" class="wr-input-control switch" data-toggle="collapse" <label id="cosu-system-update-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
data-target="#system-update-policy-body"> data-target="#cosu-system-update-policy-body">
<input type="checkbox"/> <input type="checkbox"/>
<span class="helper"></span> <span class="helper"></span>
<span class="text"></span> <span class="text"></span>
</label> </label>
<hr>
<div class="panel-title-description">
This configuration can be used to set a passcode policy to an Android Device.
Once this configuration profile is installed on a device, corresponding users will not be
able
to modify these settings on their devices.
</div>
</h2> </h2>
</div> </div>
<div id="system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="android-for-work-cosu-policy-body">
<div id="system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert"> <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-system-update-policy-body">
<div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="android-for-work-cosu-policy-system-update"> <label class="wr-input-label">
System Update System Update
<span class="helper" title="Type of the System Update to be set by the Device Owner"> <span class="helper" title="Type of the System Update to be set by the Device Owner">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
<br>
</label> </label>
<br> <br><br>
<div class="wr-input-control">
<label class="wr-input-control radio light"> <label class="wr-input-control radio light">
<input id="automatic-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update" <input id="automatic-system-update-radio-btn" type="radio" name="cosu-system-update-type"
class="form-control operationDataKeys" data-key="cosuSystemUpdateType" class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
value="automatic" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])" checked/> value="automatic" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])" checked/>
<span class="helper" title="Installs system update automatically as soon as one is available"> <span class="helper" title="Installs system update automatically as soon as one is available">
&nbsp;Automatic &nbsp;Automatic
</span> </span>
</span>
</label> </label>
<label class="wr-input-control radio light"> <label class="wr-input-control radio light">
<input id="postpone-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update" <input id="postpone-system-update-radio-btn" type="radio" name="cosu-system-update-type"
class="form-control operationDataKeys" data-key="cosuSystemUpdateType" class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
value="postpone" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])"/> value="postpone" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])"/>
<span class="helper" title="Incoming system update will be blocked for a maximum of 30 days"> <span class="helper" title="Incoming system update will be blocked for a maximum of 30 days">
&nbsp;Postpone &nbsp;Postpone
</span> </span>
</label> </label>
<label class="wr-input-control radio light"> <label class="wr-input-control radio light">
<input id="window-system-update-radio-btn" type="radio" name="android-for-work-cosu-policy-system-update" <input id="window-system-update-radio-btn" type="radio" name="cosu-system-update-type"
class="form-control operationDataKeys" data-key="cosuSystemUpdateType" class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
value="window" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'android-for-work-cosu-window-select', ['window'])"/> value="window" onclick="slideDownPaneAgainstValueSetForRadioButtons(this, 'cosu-system-update-policy-window-select', ['window'])"/>
<span class="helper" title="Install system update automatically within a daily maintenance window, for a maximum of 30 days"> <span class="helper" title="Install system update automatically within a daily maintenance window, for a maximum of 30 days">
&nbsp;Window &nbsp;Window
</span> </span>
</label> </label>
</div> </div>
</div>
<div id="cosu-system-update-policy-window-select" class="hidden">
<div id="android-for-work-cosu-window-select" class="hidden">
<div> <div>
<ul class="message message-info"> <ul class="message message-info">
<i class="icon fw fw-info"></i> <i class="icon fw fw-info"></i>
<a id="android-for-work-cosu-window-select-msg"> Below configuration of start time and end time are valid only when <a id="cosu-system-update-policy-window-select-msg">
<b>window</b> option is selected.</a> Below configuration of start time and end time are valid only when
<b>window</b> option is selected.
</a>
</ul> </ul>
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="android-for-work-cosu-window-start-time"> <label class="wr-input-label" for="cosu-system-update-policy-window-start-time">
Start Time Start Time
<span class="helper" title="Window start time for system update"> <span class="helper" title="Window start time for system update">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
</label> </label>
<select id="android-for-work-cosu-start-time" class="form-control operationDataKeys" <select id="cosu-system-update-policy-window-start-time"
data-key="cosuWindowStartTime" data-default="0"> class="form-control operationDataKeys"
<option value="1440" selected="selected"> data-key="cosuSystemUpdatePolicyWindowStartTime" data-default="0">
12 AM <option value="1440" selected="selected">12 AM</option>
</option>
<option value="60">1 AM</option> <option value="60">1 AM</option>
<option value="120">2 AM</option> <option value="120">2 AM</option>
<option value="180">3 AM</option> <option value="180">3 AM</option>
@ -1406,17 +1427,16 @@
</select> </select>
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="android-for-work-cosu-window-end-time"> <label class="wr-input-label" for="cosu-system-update-policy-window-end-time">
Start Time End Time
<span class="helper" title="Window end time for system update"> <span class="helper" title="Window end time for system update">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
</label> </label>
<select id="android-for-work-cosu-end-time" class="form-control operationDataKeys" <select id="cosu-system-update-policy-window-end-time"
data-key="cosuWindowEndTime" data-default="0"> class="form-control operationDataKeys"
<option value="1440" selected="selected"> data-key="cosuSystemUpdatePolicyWindowEndTime" data-default="0">
12 AM <option value="1440" selected="selected">12 AM</option>
</option>
<option value="60">1 AM</option> <option value="60">1 AM</option>
<option value="120">2 AM</option> <option value="120">2 AM</option>
<option value="180">3 AM</option> <option value="180">3 AM</option>
@ -1428,7 +1448,7 @@
<option value="540">9 AM</option> <option value="540">9 AM</option>
<option value="600">10 AM</option> <option value="600">10 AM</option>
<option value="660">11 AM</option> <option value="660">11 AM</option>
<option value="720">12 noon</option> <option value="720">12 Noon</option>
<option value="780">1 PM</option> <option value="780">1 PM</option>
<option value="840">2 PM</option> <option value="840">2 PM</option>
<option value="900">3 PM</option> <option value="900">3 PM</option>
@ -1443,39 +1463,49 @@
</select> </select>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
<!--system-update-policy-->
<!--whitelisted-applications--> <!-- cosu-whitelist-applications -->
<div class="panel panel-default operation-data" data-operation="whitelisted-applications" <div class="wr-hidden-operation" data-operation="cosu-whitelist-applications">
<div class="panel panel-default operation-data" data-operation="cosu-whitelist-applications"
data-operation-code="KIOSK_APPS"> data-operation-code="KIOSK_APPS">
<div id="whitelisted-applications-heading" class="panel-heading" role="tab"> <div id="cosu-whitelist-applications-heading" class="panel-heading" role="tab">
<h2 class="sub-title panel-title"> <h2 class="sub-title panel-title">
Whitelisted Applications Whitelist Applications (COSU)
<label id="whitelisted-applications-lbl" class="wr-input-control switch" data-toggle="collapse" <label id="cosu-whitelist-applications-lbl" class="wr-input-control switch" data-toggle="collapse"
data-target="#whitelisted-applications-body"> data-target="#cosu-whitelist-applications-body">
<input type="checkbox"/> <input type="checkbox"/>
<span class="helper"></span> <span class="helper"></span>
<span class="text"></span> <span class="text"></span>
</label> </label>
<hr>
<div class="panel-title-description">
This configuration can be used to set a passcode policy to an Android Device.
Once this configuration profile is installed on a device, corresponding users will not be
able
to modify these settings on their devices.
</div>
</h2> </h2>
</div> </div>
<div id="whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="whitelisted-applications-body">
<div id="whitelisted-applications-error-msg" class="alert alert-danger hidden" role="alert"> <div id="cosu-whitelist-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
aria-labelledby="cosu-whitelist-applications-body">
<div id="cosu-whitelist-applications-feature-error-msg" class="alert alert-danger hidden" role="alert">
<i class="icon fw fw-error"></i><span></span> <i class="icon fw fw-error"></i><span></span>
</div> </div>
<div class="wr-input-control"> <div class="wr-input-control">
<label class="wr-input-label" for="whitelisted-applications"> <label class="wr-input-label" for="cosu-whitelisted-applications">
<br><br>Whitelisted Applications List to enter Lock Task Mode Whitelisted Applications to enter Lock Task Mode
<span class="helper" title="Add an application to whitelist."> <span class="helper" title="Configuration information specific to a given third-party VPN solution. This has to be input as key/value pairs.">
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span> <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span> </span>
<br> <br>
<a href="#whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form"> <a href="#cosu-whitelisted-applications-grid" class="grid-input-add" data-click-event="add-form">
<span class="icon fw-stack"> <span class="icon fw-stack">
<i class="fw fw-add fw-stack-1x"></i> <i class="fw fw-add fw-stack-1x"></i>
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
@ -1484,44 +1514,43 @@
Add Application Add Application
</a> </a>
</label> </label>
<div id="whitelisted-applications" <div id="cosu-whitelisted-applications"
class="operationDataKeys grouped-array-input multi-column-key-value-pair-array" class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
data-key="cosuWhitelistedApplications" data-column-count="2"> data-key="cosuWhitelistedApplications" data-column-count="2">
<table class="table table-responsive table-striped"> <table class="table table-responsive table-striped">
<thead> <thead>
<tr> <tr>
<th>No:</th> <th>No:</th>
<th>Application Name/Description</th> <th>Application Name / Description</th>
<th>Package Name</th> <th>Package Name</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
<tbody data-add-form-container="#whitelisted-applications-grid"> <tbody data-add-form-container="#cosu-whitelisted-applications-grid">
<tr data-help-text="add-form"> <tr data-help-text="add-form">
<td colspan="4"> <td colspan="4">
No entries added yet. No entries added yet .
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="template hidden"> <table class="template hidden">
<tbody data-add-form="#whitelisted-applications-grid"> <tbody data-add-form="#cosu-whitelisted-applications-grid">
<tr data-add-form-element="clone"> <tr data-add-form-element="clone">
<td data-title="No:"> <td data-title="No:">
<span class="index"></span> <span class="index"></span>
</td> </td>
<td data-title="App Name"> <td data-title="Application Name / Description">
<input type="text" class="form-control grid-input-text" data-child-key="appName" <input type="text" class="form-control grid-input-text" data-child-key="appName"
maxlength="100" data-default="" placeholder="[ Gmail ]"/> maxlength="100" data-default="" placeholder="[ Application Name / Description ]"/>
</td> </td>
<td data-title="Package Name"> <td data-title="Package Name">
<input type="text" class="form-control grid-input-text" <input type="text" class="form-control grid-input-text" data-child-key="packageName"
data-child-key="packageName" maxlength="100" data-default="" maxlength="100" data-default="" placeholder="[ Package Name ]"/>
placeholder="[ com.google.android.gm ]"/>
</td> </td>
<td> <td>
<span class="list-group-item-actions"> <span class="list-group-item-actions">
<a href="#whitelisted-applications-grid" class="grid-input-remove" <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
data-click-event="remove-form"> data-click-event="remove-form">
<span class="fw-stack helper" title="Remove Entry"> <span class="fw-stack helper" title="Remove Entry">
<i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-ring fw-stack-2x"></i>
@ -1535,11 +1564,8 @@
</table> </table>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!--/whitelisted-applications-->
</div> </div>
<!--/android-for-work-cosu-->
</div> </div>
</div> </div>
Write Preview
Loading…
Cancel
Save