inosh
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

Browse Source
4.x.x
harshanl 8 years ago
parent 34e97aeeae ed5e954194
commit e80c2f4050
11 changed files with 196 additions and 160 deletions
Show Stats Download Patch File Download Diff File

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/PolicyManagementService.java
Unescape View File

@ -374,7 +374,7 @@ public interface PolicyManagementService {
required = true) required = true)
List<Integer> policyIds); List<Integer> policyIds);
@POST @PUT
@Path("/deactivate-policy") @Path("/deactivate-policy")
@ApiOperation( @ApiOperation(
consumes = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON,

3
components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/Application.java
Unescape View File

@ -150,6 +150,9 @@ public class Application implements Serializable {
if (applicationIdentifier != null ? !applicationIdentifier.equals(that.applicationIdentifier) : that.applicationIdentifier != null) { if (applicationIdentifier != null ? !applicationIdentifier.equals(that.applicationIdentifier) : that.applicationIdentifier != null) {
return false; return false;
} }
if (version != null ? !version.equals(that.version) : that.version != null) {
return false;
}
return true; return true;
} }

7
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java
Unescape View File

@ -217,13 +217,14 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
appIdsToRemove.add(installedApp.getId()); appIdsToRemove.add(installedApp.getId());
} }
} }
applicationMappingDAO.removeApplicationMapping(device.getId(), appIdsToRemove, tenantId);
Application installedApp; Application installedApp;
List<Integer> applicationIds = new ArrayList<>(); List<Integer> applicationIds = new ArrayList<>();
for (Application application : applications) { for (Application application : applications) {
if (!installedAppList.contains(application)) { if (!installedAppList.contains(application)) {
installedApp = applicationDAO.getApplication(application.getApplicationIdentifier(), tenantId); installedApp = applicationDAO.getApplication(application.getApplicationIdentifier(),
application.getVersion(), tenantId);
if (installedApp == null) { if (installedApp == null) {
appsToAdd.add(application); appsToAdd.add(application);
} else { } else {
@ -244,7 +245,7 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("num of remove app Ids:" + appIdsToRemove.size()); log.debug("num of remove app Ids:" + appIdsToRemove.size());
} }
applicationMappingDAO.removeApplicationMapping(device.getId(), appIdsToRemove, tenantId);
DeviceManagementDAOFactory.commitTransaction(); DeviceManagementDAOFactory.commitTransaction();
} catch (DeviceManagementDAOException e) { } catch (DeviceManagementDAOException e) {
DeviceManagementDAOFactory.rollbackTransaction(); DeviceManagementDAOFactory.rollbackTransaction();

2
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/ApplicationDAO.java
Unescape View File

@ -32,5 +32,7 @@ public interface ApplicationDAO {
Application getApplication(String identifier, int tenantId) throws DeviceManagementDAOException; Application getApplication(String identifier, int tenantId) throws DeviceManagementDAOException;
Application getApplication(String identifier, String version,int tenantId) throws DeviceManagementDAOException;
List<Application> getInstalledApplications(int deviceId) throws DeviceManagementDAOException; List<Application> getInstalledApplications(int deviceId) throws DeviceManagementDAOException;
} }

28
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/ApplicationDAOImpl.java
Unescape View File

@ -228,6 +228,34 @@ public class ApplicationDAOImpl implements ApplicationDAO {
} }
} }
@Override
public Application getApplication(String identifier, String version, int tenantId) throws DeviceManagementDAOException {
Connection conn;
PreparedStatement stmt = null;
ResultSet rs = null;
Application application = null;
try {
conn = this.getConnection();
stmt = conn.prepareStatement("SELECT ID, NAME, APP_IDENTIFIER, PLATFORM, CATEGORY, VERSION, TYPE, " +
"LOCATION_URL, IMAGE_URL, APP_PROPERTIES, MEMORY_USAGE, IS_ACTIVE, TENANT_ID FROM DM_APPLICATION WHERE APP_IDENTIFIER = ? " +
"AND VERSION = ? AND TENANT_ID = ?");
stmt.setString(1, identifier);
stmt.setString(2, version);
stmt.setInt(3, tenantId);
rs = stmt.executeQuery();
if (rs.next()) {
application = this.loadApplication(rs);
}
return application;
} catch (SQLException e) {
throw new DeviceManagementDAOException("Error occurred while retrieving application application '" +
identifier + "' and version '" + version + "'.", e);
} finally {
DeviceManagementDAOUtil.cleanupResources(stmt, rs);
}
}
private Connection getConnection() throws SQLException { private Connection getConnection() throws SQLException {
return DeviceManagementDAOFactory.getConnection(); return DeviceManagementDAOFactory.getConnection();
} }

9
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policy.priority/priority.hbs
Unescape View File

@ -15,7 +15,7 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
}} }}
{{unit "cdmf.unit.ui.title" pageTitle="Policy Management"}} {{unit "cdmf.unit.ui.title" pageTitle="Policy Management | Policy Priorities"}}
{{#zone "breadcrumbs"}} {{#zone "breadcrumbs"}}
<li> <li>
@ -24,10 +24,17 @@
</a> </a>
</li> </li>
<li> <li>
<!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/policies"> <a href="{{@app.context}}/policies">
Policies Policies
</a> </a>
</li> </li>
<li>
<!--suppress HtmlUnknownTarget -->
<a href="{{@app.context}}/policy/priority">
Priorities
</a>
</li>
{{/zone}} {{/zone}}
{{#zone "content"}} {{#zone "content"}}

56
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/priority.hbs
Unescape View File

@ -15,17 +15,16 @@
specific language governing permissions and limitations specific language governing permissions and limitations
under the License. under the License.
}} }}
<div class="row wr-device-board"> <div class="row wr-device-board">
<div class="col-lg-12 wr-secondary-bar"> <div class="col-lg-12 wr-secondary-bar">
<span class="page-sub-title"> <span class="page-sub-title">
&nbsp;Policy List by priority order &nbsp;Policy List by priority order
</span> </span>
</div> </div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<span id="policy-listing-status-msg">{{policyListingStatusMsg}}</span> <span id="policy-listing-status-msg">{{policyListingStatusMsg}}</span>
<div class="wr-list-group wr-sortable policy-list"> <div class="wr-list-group wr-sortable policy-list">
{{#each policyListToView}} {{#each policyListToView}}
<span class="list-group-item " place="place_{{id}}" id="{{id}}"> <span class="list-group-item " place="place_{{id}}" id="{{id}}">
@ -40,15 +39,7 @@
</span> </span>
</span> </span>
<span class="wr-list-icon"> <span class="wr-list-icon">
{{#equal platform "android"}} <i class=" fw fw-{{platform}}"></i>
<i class=" fw fw-android"></i>
{{/equal}}
{{#equal platform "windows"}}
<i class=" fw fw-windows"></i>
{{/equal}}
{{#equal platform "ios"}}
<i class=" fw fw-apple"></i>
{{/equal}}
</span> </span>
<span class="wr-list-desc"> <span class="wr-list-desc">
<h3 class="wr-list-name">{{name}}</h3> <h3 class="wr-list-name">{{name}}</h3>
@ -62,19 +53,20 @@
<b>Ownership Type : </b> {{ownershipType}} <b>Ownership Type : </b> {{ownershipType}}
</div> </div>
</div> </div>
{{#if roles}} {{#equal roles "None"}}
<div class="wr-desc-list-configs highlight col-xs-12 col-sm-4 col-md-4 col-lg-4"> <div class="wr-desc-list-configs highlight col-xs-12 col-sm-4 col-md-4 col-lg-4">
<div> <div>
<b>Assigned Role(s) : </b> {{roles}} <b>Assigned User(s) : </b> {{users}}
</div> </div>
</div> </div>
{{else}} {{/equal}}
{{#equal users "None"}}
<div class="wr-desc-list-configs highlight col-xs-12 col-sm-4 col-md-4 col-lg-4"> <div class="wr-desc-list-configs highlight col-xs-12 col-sm-4 col-md-4 col-lg-4">
<div> <div>
<b>Assigned User(s) : </b> {{users}} <b>Assigned Role(s) : </b> {{roles}}
</div> </div>
</div> </div>
{{/if}} {{/equal}}
<div class="wr-desc-list-configs col-xs-12 col-sm-4 col-md-4 col-lg-4"> <div class="wr-desc-list-configs col-xs-12 col-sm-4 col-md-4 col-lg-4">
<div> <div>
<b>Compliance Type :</b> {{compliance}} <b>Compliance Type :</b> {{compliance}}
@ -89,8 +81,7 @@
{{#equal noPolicy false}} {{#equal noPolicy false}}
<div id="save-new-priorities-button" class="wr-input-control wr-btn-grp"> <div id="save-new-priorities-button" class="wr-input-control wr-btn-grp">
<button class="wr-btn hide" id="sortUpdateBtn" data-policycount="{{policyCount}}" <button class="wr-btn hide" id="sortUpdateBtn" data-policycount="{{policyCount}}"
data-enabled="{{saveNewPrioritiesButtonEnabled}}" disabled>Save New Priority data-enabled="{{saveNewPrioritiesButtonEnabled}}" disabled>Save New Priority Order
Order
</button> </button>
<button class="wr-btn" id="applyChangesBtn">Apply Changes to Devices</button> <button class="wr-btn" id="applyChangesBtn">Apply Changes to Devices</button>
</div> </div>
@ -98,18 +89,17 @@
</div> </div>
</div> </div>
<div id="change-policy-modal-content" class="hide"> <div id="apply-changes-modal-content" class="hide">
<div class="content"> <div class="content">
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-6 col-centered"> <div class="col-lg-5 col-md-6 col-centered">
<h3>Do you really want to apply changes to all policies?</h3> <h3>Do you really want to apply changes to all policies?</h3>
<div class="buttons"> <div class="buttons">
<a href="javascript:void(0)" id="change-policy-yes-link" class="btn-operations"> <a href="javascript:void(0)" id="apply-changes-yes-link" class="btn-operations">
Yes Yes
</a> </a>
<a href="javascript:void(0)" id="change-policy-cancel-link" <a href="javascript:void(0)" id="apply-changes-cancel-link" class="btn-operations">
class="btn-operations">
No No
</a> </a>
</div> </div>
@ -118,15 +108,14 @@
</div> </div>
</div> </div>
<div id="change-policy-success-content" class="hide"> <div id="apply-changes-success-content" class="hide">
<div class="content"> <div class="content">
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-6 col-centered"> <div class="col-lg-5 col-md-6 col-centered">
<h3>Done. Changes applied successfully.</h3> <h3>Done. Changes applied successfully.</h3>
<div class="buttons"> <div class="buttons">
<a href="javascript:void(0)" id="change-policy-success-link" <a href="javascript:void(0)" id="apply-changes-success-link" class="btn-operations">
class="btn-operations">
Ok Ok
</a> </a>
</div> </div>
@ -135,15 +124,14 @@
</div> </div>
</div> </div>
<div id="change-policy-error-content" class="hide"> <div id="apply-changes-error-content" class="hide">
<div class="content"> <div class="content">
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-6 col-centered"> <div class="col-lg-5 col-md-6 col-centered">
<h3>An unexpected error occurred. Please try again later.</h3> <h3>An unexpected error occurred. Please try again later.</h3>
<div class="buttons"> <div class="buttons">
<a href="javascript:void(0)" id="change-policy-error-link" <a href="javascript:void(0)" id="apply-changes-error-link" class="btn-operations">
class="btn-operations">
Ok Ok
</a> </a>
</div> </div>
@ -159,8 +147,7 @@
<h3>An unexpected error occurred. Please try again later.</h3> <h3>An unexpected error occurred. Please try again later.</h3>
<div class="buttons"> <div class="buttons">
<a href="javascript:void(0)" id="remove-policy-error-link" <a href="javascript:void(0)" id="remove-policy-error-link" class="btn-operations">
class="btn-operations">
Ok Ok
</a> </a>
</div> </div>
@ -176,8 +163,7 @@
<h3>Done. New Policy priorities were successfully updated.</h3> <h3>Done. New Policy priorities were successfully updated.</h3>
<div class="buttons"> <div class="buttons">
<a href="javascript:void(0)" id="save-policy-priorities-success-link" <a href="javascript:void(0)" id="save-policy-priorities-success-link" class="btn-operations">
class="btn-operations">
Ok Ok
</a> </a>
</div> </div>
@ -191,11 +177,8 @@
<div class="row"> <div class="row">
<div class="col-lg-5 col-md-6 col-centered"> <div class="col-lg-5 col-md-6 col-centered">
<h3>An unexpected error occurred. Please try again later.</h3> <h3>An unexpected error occurred. Please try again later.</h3>
<h4 class="message-from-server"></h4>
<div class="buttons"> <div class="buttons">
<a href="javascript:void(0)" id="save-policy-priorities-error-link" <a href="javascript:void(0)" id="save-policy-priorities-error-link" class="btn-operations">
class="btn-operations">
Ok Ok
</a> </a>
</div> </div>
@ -203,6 +186,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
{{#zone "bottomJs"}} {{#zone "bottomJs"}}
{{js "js/policy-priority.js"}} {{js "js/policy-priority.js"}}

15
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/priority.js
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
* *
* WSO2 Inc. licenses this file to you under the Apache License, * WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except * Version 2.0 (the "License"); you may not use this file except
@ -10,8 +10,8 @@
* *
* Unless required by applicable law or agreed to in writing, * Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an * software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* KIND, either express or implied. See the License for the * either express or implied. See the License for the
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
@ -27,8 +27,9 @@ function onRequest(context) {
return options.fn(this); return options.fn(this);
} }
}); });
var policyModule = require("/app/modules/business-controllers/group.js")["groupModule"]; var policyModule = require("/app/modules/business-controllers/policy.js")["policyModule"];
var response = policyModule.getAllPolicies(); var response = policyModule.getAllPolicies();
if (response["status"] == "success") { if (response["status"] == "success") {
var policyListToView = response["content"]; var policyListToView = response["content"];
context["policyListToView"] = policyListToView; context["policyListToView"] = policyListToView;
@ -38,7 +39,7 @@ function onRequest(context) {
context["saveNewPrioritiesButtonEnabled"] = false; context["saveNewPrioritiesButtonEnabled"] = false;
context["noPolicy"] = true; context["noPolicy"] = true;
} else if (policyCount == 1) { } else if (policyCount == 1) {
context["policyListingStatusMsg"] = "Add more policies to set up a priority order."; context["policyListingStatusMsg"] = "Two or more policies should be available to set up a priority order.";
context["saveNewPrioritiesButtonEnabled"] = false; context["saveNewPrioritiesButtonEnabled"] = false;
context["noPolicy"] = false; context["noPolicy"] = false;
} else { } else {
@ -47,9 +48,11 @@ function onRequest(context) {
context["noPolicy"] = false; context["noPolicy"] = false;
} }
} else { } else {
// here, response["status"] == "error"
context["policyListToView"] = []; context["policyListToView"] = [];
context["policyListingStatusMsg"] = response["content"]; context["policyListingStatusMsg"] = "Error in retrieving policies. Please try reloading the page.";
context["saveNewPrioritiesButtonEnabled"] = false; context["saveNewPrioritiesButtonEnabled"] = false;
} }
return context; return context;
} }

46
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/public/js/policy-priority.js
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
* *
* WSO2 Inc. licenses this file to you under the Apache License, * WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except * Version 2.0 (the "License"); you may not use this file except
@ -10,8 +10,8 @@
* *
* Unless required by applicable law or agreed to in writing, * Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an * software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
* KIND, either express or implied. See the License for the * either express or implied. See the License for the
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
@ -78,58 +78,66 @@ $(document).ready(function () {
newPolicyPriorityList.push(policy); newPolicyPriorityList.push(policy);
} }
var updatePolicyAPI = "/devicemgt_admin/policies/priorities"; var updatePolicyAPI = "/api/device-mgt/v1.0/policies/priorities";
invokerUtil.put( invokerUtil.put(
updatePolicyAPI, updatePolicyAPI,
newPolicyPriorityList, newPolicyPriorityList,
function () { // on success
function (data, textStatus, jqXHR) {
if (jqXHR.status == 200) {
$(modalPopupContent).html($('#save-policy-priorities-success-content').html()); $(modalPopupContent).html($('#save-policy-priorities-success-content').html());
showPopup(); showPopup();
$("a#save-policy-priorities-success-link").click(function () { $("a#save-policy-priorities-success-link").click(function () {
hidePopup(); hidePopup();
}); });
}
}, },
function () { // on error
$("#save-policy-priorities-error-content").find(".message-from-server").html( function (jqXHR) {
"Message From Server : " + data["statusText"]); if (jqXHR.status == 400 || jqXHR.status == 500) {
$(modalPopupContent).html($('#save-policy-priorities-error-content').html()); $(modalPopupContent).html($("#save-policy-priorities-error-content").html());
showPopup(); showPopup();
$("a#save-policy-priorities-error-link").click(function () { $("a#save-policy-priorities-error-link").click(function () {
hidePopup(); hidePopup();
}); });
} }
}
); );
}); });
$(applyChangesBtn).click(function () { $(applyChangesBtn).click(function () {
var applyPolicyChangesAPI = "/devicemgt_admin/policies/apply-changes"; var applyPolicyChangesAPI = "/api/device-mgt/v1.0/policies/apply-changes";
$(modalPopupContent).html($('#change-policy-modal-content').html()); $(modalPopupContent).html($("#apply-changes-modal-content").html());
showPopup(); showPopup();
$("a#change-policy-yes-link").click(function () { $("a#apply-changes-yes-link").click(function () {
invokerUtil.put( invokerUtil.put(
applyPolicyChangesAPI, applyPolicyChangesAPI,
null, null,
// on success // on success
function () { function (data, textStatus, jqXHR) {
$(modalPopupContent).html($('#change-policy-success-content').html()); if (jqXHR.status == 200) {
$(modalPopupContent).html($("#apply-changes-success-content").html());
showPopup(); showPopup();
$("a#change-policy-success-link").click(function () { $("a#apply-changes-success-link").click(function () {
hidePopup(); hidePopup();
}); });
}
}, },
// on error // on error
function () { function (jqXHR) {
$(modalPopupContent).html($('#change-policy-error-content').html()); if (jqXHR.status == 500) {
$(modalPopupContent).html($("#apply-changes-error-content").html());
showPopup(); showPopup();
$("a#change-policy-error-link").click(function () { $("a#apply-changes-error-link").click(function () {
hidePopup(); hidePopup();
}); });
} }
}
); );
}); });
$("a#change-policy-cancel-link").click(function () { $("a#apply-changes-cancel-link").click(function () {
hidePopup(); hidePopup();
}); });
}); });

4
components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.priority/public/js/sortable-list.js
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved. * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
* *
* WSO2 Inc. licenses this file to you under the Apache License, * WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except * Version 2.0 (the "License"); you may not use this file except
@ -47,7 +47,7 @@ var sortableListFunction = (function () {
} }
/** /**
* on input text field focus autocomplete bind function * on input text field focus auto-complete bind function
*/ */
$(sortableElem).on('focus', '.wr-sort-index input.index', function () { $(sortableElem).on('focus', '.wr-sort-index input.index', function () {
currentElemId = $(this).val(); currentElemId = $(this).val();

Write Preview
Loading…
Cancel
Save