Merge remote-tracking branch 'upstream/master'

revert-dabc3590
Megala 8 years ago
commit 48ab67c824

@ -1,7 +1,7 @@
<div class="wr-list-group wr-sortable policy-list"> <div class="wr-list-group wr-sortable policy-list">
<span class="list-group-item" id="{{id}}"> <span class="list-group-item" id="{{id}}">
<div class="row"> <div class="row">
<div class="col-lg-2 clearfix" style="padding-left: 20px; padding-top: 10px;"> <div class="col-lg-4 clearfix" style="padding-left: 20px; padding-top: 10px;">
<span class="wr-list-icon"> <span class="wr-list-icon">
{{#equal deviceType "android"}} {{#equal deviceType "android"}}
<i class=" fw fw-android"></i> <i class=" fw fw-android"></i>
@ -18,7 +18,7 @@
<span>{{deviceType}}</span> <span>{{deviceType}}</span>
</span> </span>
</div> </div>
<div class="col-lg-7"> <div class="col-lg-6">
<div class="row no-gutter"> <div class="row no-gutter">
<div class="wr-desc-list-configs col-lg-4"> <div class="wr-desc-list-configs col-lg-4">
<div> <div>
@ -48,7 +48,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-2"> <div class="col-lg-1">
<span class="list-group-item-actions" style="padding-top: 15px;"> <span class="list-group-item-actions" style="padding-top: 15px;">
<!--suppress HtmlUnknownTarget --> <!--suppress HtmlUnknownTarget -->
<a href="/emm/policy/view?id={{policy.id}}" <a href="/emm/policy/view?id={{policy.id}}"

@ -21,7 +21,6 @@ function onRequest(context) {
var deviceType = context["uriParams"]["deviceType"]; var deviceType = context["uriParams"]["deviceType"];
var deviceId = request.getParameter("id"); var deviceId = request.getParameter("id");
var deviceViewData = {}; var deviceViewData = {};
var log = new Log("new log");
if (deviceType && deviceId) { if (deviceType && deviceId) {
var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"]; var deviceModule = require("/app/modules/business-controllers/device.js")["deviceModule"];

Loading…
Cancel
Save