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 pull request #784 from lasanthaDLPDS/master

Browse Source 
fixes wso2/product-iots#1246
This commit is contained in:
Geeth 2017-08-03 20:57:08 +05:30 committed by GitHub
commit 7abb795ac7
2 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/public/js/download.js
View File

@ -84,8 +84,8 @@ function attachEvents() {
* on Device Management page in WSO2 DC Console. * on Device Management page in WSO2 DC Console.
*/ */
$("a.download-link").click(function () { $("a.download-link").click(function () {
var sketchType = $(this).data("sketchtype"); var sketchType = $(".deviceType").val();
var deviceType = $(this).data("devicetype"); var deviceType = $(".sketchType").val();
var downloadDeviceAPI = "/devicemgt/api/devices/sketch/generate_link"; var downloadDeviceAPI = "/devicemgt/api/devices/sketch/generate_link";
var payload = {"sketchType": sketchType, "deviceType": deviceType}; var payload = {"sketchType": sketchType, "deviceType": deviceType};
$(modalPopupContent).html($('#download-device-modal-content').html()); $(modalPopupContent).html($('#download-device-modal-content').html());
@ -100,16 +100,24 @@ function attachEvents() {
$('label[for=deviceName]').remove(); $('label[for=deviceName]').remove();
if (deviceName && deviceName.length >= 4) { if (deviceName && deviceName.length >= 4) {
payload.deviceName = deviceName; payload.deviceName = deviceName;
invokerUtil.post( var request = {
downloadDeviceAPI, url: downloadDeviceAPI,
payload, type: "POST",
function (data, textStatus, jqxhr) { contentType: "application/json",
doAction(data); data: JSON.stringify(payload),
}, accept: "application/json",
function (data) { async : true,
doAction(data); success: doAction,
error: function (jqXHR) {
if (jqXHR.status == 401) {
$(modalPopupContent).html($("#error-msg").html());
showPopup();
} else {
doAction(jqXHR);
}
} }
); };
$.ajax(request);
}else if(deviceName){ }else if(deviceName){
$('.controls').append('<label for="deviceName" generated="true" class="error" ' + $('.controls').append('<label for="deviceName" generated="true" class="error" ' +
'style="display: inline-block;">Please enter at least 4 ' + 'style="display: inline-block;">Please enter at least 4 ' +
@ -159,10 +167,7 @@ function doAction(data) {
if (data.status == "200") { if (data.status == "200") {
$(modalPopupContent).html($('#download-device-modal-content-links').html()); $(modalPopupContent).html($('#download-device-modal-content-links').html());
$("input#download-device-url").val(data.responseText); $("#download-device-url").html(data.responseText);
$("input#download-device-url").focus(function () {
$(this).select();
});
showPopup(); showPopup();
} else if (data.status == "401") { } else if (data.status == "401") {
$(modalPopupContent).html($('#device-401-content').html()); $(modalPopupContent).html($('#device-401-content').html());

15
components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs
View File

@ -85,16 +85,16 @@
name="deviceName" size="60" required> name="deviceName" size="60" required>
<br/> <br/>
<input type="hidden" class="deviceType" name="deviceType" <input type="hidden" class="deviceType" name="deviceType"
value="raspberrypi"/> value="raspberrypi" />
<input type="hidden" class="sketchType" name="sketchType" <input type="hidden" class="sketchType" name="sketchType"
value="raspberrypi"/> value="raspberrypi" />
</div> </div>
</div> </div>
<div class="buttons" style="padding-bottom: 0px"> <div class="buttons" style="padding-bottom: 0px">
<a class="btn btn-operations" onclick="downloadAgent()">Download Now</a> <a class="btn btn-operations" onclick="downloadAgent()">Download Now</a>
<a href="#" id="download-device-download-link" <a href="#" id="download-device-download-link"
class="btn btn-operations hidden"> Copy Link class="btn btn-operations"> Copy Link
</a> </a>
</div> </div>
@ -112,6 +112,15 @@
</div> </div>
</div> </div>
</div> </div>
<div id="download-device-modal-content-links" class="hide">
<div class="modal-content">
<div class="row">
<div class="col-md-7 col-centered center-container">
<h4 id="download-device-url"></h4>
</div>
</div>
</div>
</div>
<div id="device-400-content" class="hide"> <div id="device-400-content" class="hide">
<div class="modal-content"> <div class="modal-content">
<div class="row"> <div class="row">