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

Merge branch 'COPEqr' into 'master'

Browse Source 
Add UI changes to enroll COPE using QR code

See merge request entgra/carbon-device-mgt-plugins!123
This commit is contained in:
Dharmakeerthi Lasantha 2019-12-10 13:50:28 +00:00
commit c4a45fb17b
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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.platform.configuration/configuration.hbs
View File

@ -166,6 +166,7 @@
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
</span>
<br>
( ex: www.abc.com:8280 )
</label>
<input id="android-kiosk-config-server-ip" type="text" class="form-control" >

2
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.type-view/public/js/type-view.js
View File

@ -108,7 +108,7 @@ function generateKIOSKQRCode(qrCodeClass) {
function(data) {
data = JSON.parse(data);
if (data != null && data.configuration != null) {
if (ownership_type == "COSU") {
if (ownership_type == "COSU" || ownership_type == "COPE") {
for (var i = 0; i < data.configuration.length; i++) {
var config = data.configuration[i];
if (config.name === kioskConfigs["adminComponentName"]) {

2
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.type-view/type-view.hbs
View File

@ -85,7 +85,7 @@
<hr>
<h3>Step 02 - Enroll the Android Agent.</h3><br>
<p>Your device can be enrolled with Entgra IoTS automatically via QR code or manually by a wizard.
To enroll automatically; first download agent as mentioned in Step 1 then proceed with the ENROLL WITH QR option from the device setup activity.
To enroll automatically, first download and install the agent as mentioned in Step 1 then proceed with the ENROLL WITH QR option from the device setup activity.
Thereafter select the ownership configuration and scan the generated QR to complete the process.
To enroll manually; select the Manual enrollment option from the setup activity and follow the succeeding steps.</p>
<br>