Merge pull request #661 from charithag/master

Fixes and improvments
revert-70aa11f8
Geeth 8 years ago committed by GitHub
commit c0a474f6fc

@ -81,21 +81,11 @@ var operationModule = function () {
publicMethods.getControlOperations = function (deviceType) { publicMethods.getControlOperations = function (deviceType) {
var operations = privateMethods.getOperationsFromFeatures(deviceType, "operation"); var operations = privateMethods.getOperationsFromFeatures(deviceType, "operation");
var features = utility.getDeviceTypeConfig(deviceType).deviceType.features;
for (var op in operations) { for (var op in operations) {
var iconIdentifier = operations[op].operation; var iconIdentifier = operations[op].operation;
if (features && features[iconIdentifier]) { var icon = utility.getOperationIcon(deviceType, iconIdentifier);
var icon = features[iconIdentifier].icon;
if (icon) { if (icon) {
operations[op]["iconFont"] = icon; operations[op]["icon"] = icon;
} else if (iconPath) {
var iconPath = utility.getOperationIcon(deviceType, iconIdentifier);
operations[op]["icon"] = iconPath;
}
var formParams = features[iconIdentifier].formParams;
if (formParams) {
operations[op]["uiParams"] = formParams;
}
} }
} }
return operations; return operations;

@ -67,8 +67,8 @@
<div class="try-device-container" id="{{deviceTypeName}}"> <div class="try-device-container" id="{{deviceTypeName}}">
<div class="message message-info try-device-message"> <div class="message message-info try-device-message">
<p class="try-device-text"> <p class="try-device-text">
<button id="{{deviceTypeName}}_btn" onclick="location.href='{{@app <button id="{{deviceTypeName}}_btn"
.context}}/device/{{deviceTypeName}}/enroll'" onclick="location.href='{{@app.context}}/device/{{deviceTypeName}}/enroll?type=virtual'"
class="btn btn-default btn-primary">Try class="btn btn-default btn-primary">Try
</button> </button>
our {{deviceTypeLabel}} device our {{deviceTypeLabel}} device

@ -21,6 +21,7 @@ function onRequest(context) {
var DTYPE_CONF_DEVICE_TYPE_KEY = "deviceType"; var DTYPE_CONF_DEVICE_TYPE_KEY = "deviceType";
var DTYPE_CONF_DEVICE_CATEGORY = "category"; var DTYPE_CONF_DEVICE_CATEGORY = "category";
var DTYPE_CONF_DEVICE_TYPE_LABEL_KEY = "label"; var DTYPE_CONF_DEVICE_TYPE_LABEL_KEY = "label";
var DTYPE_CONF_VIRTUAL_DEVICE_TYPE_LABEL_KEY = "virtualLabel";
var viewModel = {}; var viewModel = {};
var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"]; var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];
@ -54,6 +55,25 @@ function onRequest(context) {
"deviceCategory": deviceCategory, "deviceCategory": deviceCategory,
"thumb": utility.getDeviceThumb(deviceType) "thumb": utility.getDeviceThumb(deviceType)
}); });
} else if (deviceCategory == 'hybrid') {
var virtualLabel = configs[DTYPE_CONF_DEVICE_TYPE_KEY][DTYPE_CONF_VIRTUAL_DEVICE_TYPE_LABEL_KEY];
if (!virtualLabel) {
virtualLabel = deviceTypeLabel;
}
virtualDeviceTypesList.push({
"hasCustTemplate": false,
"deviceTypeLabel": virtualLabel,
"deviceTypeName": deviceType,
"deviceCategory": deviceCategory,
"thumb": utility.getDeviceThumb(deviceType)
});
deviceTypesList.push({
"hasCustTemplate": false,
"deviceTypeLabel": deviceTypeLabel,
"deviceTypeName": deviceType,
"deviceCategory": deviceCategory,
"thumb": utility.getDeviceThumb(deviceType)
});
} else { } else {
deviceTypesList.push({ deviceTypesList.push({
"hasCustTemplate": false, "hasCustTemplate": false,

Loading…
Cancel
Save