mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
This commit is contained in:
hasuniea
commit
1ebf4e2c7c
@ -18,6 +18,7 @@
|
||||
*/
|
||||
package org.wso2.carbon.device.mgt.jaxrs.service.impl;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.context.CarbonContext;
|
||||
@ -127,8 +128,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
||||
request.setSince(sinceDate);
|
||||
result = dms.getAllDevices(request);
|
||||
if (result == null || result.getData() == null || result.getData().size() <= 0) {
|
||||
return Response.status(Response.Status.OK).entity("No device is modified " +
|
||||
"after the timestamp provided in 'since' filter").build();
|
||||
return Response.status(Response.Status.OK).entity(new JsonArray()).build();
|
||||
}
|
||||
} else {
|
||||
result = dms.getAllDevices(request);
|
||||
|
||||
@ -221,14 +221,22 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
|
||||
RequestValidationUtil.validatePolicyIds(policyIds);
|
||||
PolicyManagerService policyManagementService = DeviceMgtAPIUtils.getPolicyManagementService();
|
||||
boolean policyDeleted = true;
|
||||
String invalidPolicyIds = "";
|
||||
try {
|
||||
PolicyAdministratorPoint pap = policyManagementService.getPAP();
|
||||
for (int i : policyIds) {
|
||||
Policy policy = pap.getPolicy(i);
|
||||
if (policy == null || !pap.deletePolicy(policy)) {
|
||||
if (policy == null) {
|
||||
invalidPolicyIds += i + ",";
|
||||
policyDeleted = false;
|
||||
}
|
||||
}
|
||||
if(policyDeleted) {
|
||||
for(int i : policyIds) {
|
||||
Policy policy = pap.getPolicy(i);
|
||||
pap.deletePolicy(policy);
|
||||
}
|
||||
}
|
||||
} catch (PolicyManagementException e) {
|
||||
String msg = "ErrorResponse occurred while removing policies";
|
||||
log.error(msg, e);
|
||||
@ -239,8 +247,10 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
|
||||
return Response.status(Response.Status.OK).entity("Policies have been successfully deleted").build();
|
||||
} else {
|
||||
//TODO:Check of this logic is correct
|
||||
return Response.status(Response.Status.NOT_FOUND).entity(
|
||||
new ErrorResponse.ErrorResponseBuilder().setMessage("Policy doesn't exist").build()).build();
|
||||
String ModifiedInvalidPolicyIds = invalidPolicyIds.substring(0, invalidPolicyIds.length()-1);
|
||||
return Response.status(Response.Status.BAD_REQUEST).entity(
|
||||
new ErrorResponse.ErrorResponseBuilder().setMessage("Policies with the policy ID " +
|
||||
ModifiedInvalidPolicyIds + " doesn't exist").build()).build();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -416,11 +416,13 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
|
||||
boolean isOwnershipProvided = false;
|
||||
String status = request.getStatus();
|
||||
boolean isStatusProvided = false;
|
||||
Date since = request.getSince();
|
||||
boolean isSinceProvided = false;
|
||||
try {
|
||||
conn = this.getConnection();
|
||||
String sql = "SELECT COUNT(d1.ID) AS DEVICE_COUNT FROM DM_ENROLMENT e, (SELECT d.ID, d.NAME, d.DEVICE_IDENTIFICATION, " +
|
||||
"t.NAME AS DEVICE_TYPE FROM DM_DEVICE d, DM_DEVICE_TYPE t WHERE DEVICE_TYPE_ID = t.ID " +
|
||||
"AND d.TENANT_ID = ?";
|
||||
"t.NAME AS DEVICE_TYPE FROM DM_DEVICE d, DM_DEVICE_TYPE t, DM_DEVICE_DETAIL dt WHERE DEVICE_TYPE_ID = t.ID " +
|
||||
"AND d.TENANT_ID = ? AND dt.DEVICE_ID = d.ID";
|
||||
|
||||
if (deviceType != null && !deviceType.isEmpty()) {
|
||||
sql = sql + " AND t.NAME = ?";
|
||||
@ -432,6 +434,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
|
||||
isDeviceNameProvided = true;
|
||||
}
|
||||
|
||||
//Add query for last updated timestamp
|
||||
if (since != null) {
|
||||
sql = sql + " AND dt.UPDATE_TIMESTAMP > ?";
|
||||
isSinceProvided = true;
|
||||
}
|
||||
|
||||
sql = sql + ") d1 WHERE d1.ID = e.DEVICE_ID AND TENANT_ID = ?";
|
||||
|
||||
if (ownership != null && !ownership.isEmpty()) {
|
||||
@ -458,6 +466,9 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
|
||||
if (isDeviceNameProvided) {
|
||||
stmt.setString(paramIdx++, request.getDeviceName() + "%");
|
||||
}
|
||||
if (isSinceProvided) {
|
||||
stmt.setLong(paramIdx++, since.getTime());
|
||||
}
|
||||
stmt.setInt(paramIdx++, tenantId);
|
||||
if (isOwnershipProvided) {
|
||||
stmt.setString(paramIdx++, request.getOwnership());
|
||||
|
||||
@ -59,8 +59,9 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
|
||||
String sql = "SELECT d1.ID AS DEVICE_ID, d1.DESCRIPTION, d1.NAME AS DEVICE_NAME, d1.DEVICE_TYPE, " +
|
||||
"d1.DEVICE_IDENTIFICATION, e.OWNER, e.OWNERSHIP, e.STATUS, e.DATE_OF_LAST_UPDATE, " +
|
||||
"e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e, (SELECT d.ID, d.DESCRIPTION, " +
|
||||
"d.NAME, d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE FROM DM_DEVICE d, DM_DEVICE_TYPE t " +
|
||||
"WHERE DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ?";
|
||||
"d.NAME, d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE " +
|
||||
"FROM DM_DEVICE d, DM_DEVICE_TYPE t, DM_DEVICE_DETAIL dt " +
|
||||
"WHERE DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ? AND dt.DEVICE_ID = d.ID";
|
||||
|
||||
//Add the query for device-type
|
||||
if (deviceType != null && !deviceType.isEmpty()) {
|
||||
@ -75,7 +76,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
|
||||
|
||||
//Add query for last updated timestamp
|
||||
if (since != null) {
|
||||
sql = sql + " AND d.LAST_UPDATED_TIMESTAMP > ?";
|
||||
sql = sql + " AND dt.UPDATE_TIMESTAMP > ?";
|
||||
isSinceProvided = true;
|
||||
}
|
||||
|
||||
@ -109,7 +110,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
|
||||
stmt.setString(paramIdx++, request.getDeviceName() + "%");
|
||||
}
|
||||
if (isSinceProvided) {
|
||||
stmt.setTimestamp(paramIdx++, new Timestamp(since.getTime()));
|
||||
stmt.setLong(paramIdx++, since.getTime());
|
||||
}
|
||||
stmt.setInt(paramIdx++, tenantId);
|
||||
if (isOwnershipProvided) {
|
||||
|
||||
@ -102,7 +102,7 @@ public class OperationManagerImpl implements OperationManager {
|
||||
DeviceIDHolder deviceIDHolder = DeviceManagerUtil.validateDeviceIdentifiers(deviceIds);
|
||||
List<DeviceIdentifier> validDeviceIds = deviceIDHolder.getValidDeviceIDList();
|
||||
if (validDeviceIds.size() > 0) {
|
||||
List<DeviceIdentifier> authorizedDeviceList = this.getAuthorizedDevices(operation, deviceIds);
|
||||
List<DeviceIdentifier> authorizedDeviceList = this.getAuthorizedDevices(operation, validDeviceIds);
|
||||
if (authorizedDeviceList.size() <= 0) {
|
||||
log.info("User : " + getUser() + " is not authorized to perform operations on given device-list.");
|
||||
return null;
|
||||
@ -123,7 +123,7 @@ public class OperationManagerImpl implements OperationManager {
|
||||
|
||||
//TODO have to create a sql to load device details from deviceDAO using single query.
|
||||
String operationCode = operationDto.getCode();
|
||||
for (DeviceIdentifier deviceId : deviceIds) {
|
||||
for (DeviceIdentifier deviceId : authorizedDeviceList) {
|
||||
Device device = getDevice(deviceId);
|
||||
enrolmentId = device.getEnrolmentInfo().getId();
|
||||
//Do not repeat the task operations
|
||||
|
||||
@ -420,7 +420,8 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
"ON feom.OPERATION_ID = o.ID LEFT OUTER JOIN (SELECT ID, ENROLMENT_ID, OPERATION_ID, " +
|
||||
"OPERATION_RESPONSE, MAX(RECEIVED_TIMESTAMP) LATEST_RECEIVED_TIMESTAMP " +
|
||||
"FROM DM_DEVICE_OPERATION_RESPONSE GROUP BY ENROLMENT_ID , OPERATION_ID) orsp " +
|
||||
"ON o.ID = orsp.OPERATION_ID AND feom.ENROLMENT_ID = orsp.ENROLMENT_ID GROUP BY feom.ENROLMENT_ID";
|
||||
"ON o.ID = orsp.OPERATION_ID AND feom.ENROLMENT_ID = orsp.ENROLMENT_ID GROUP BY feom.ENROLMENT_ID, " +
|
||||
"feom.OPERATION_ID";
|
||||
|
||||
stmt = conn.prepareStatement(sql);
|
||||
|
||||
|
||||
@ -58,8 +58,10 @@ under the License. --}}
|
||||
<!-- page-content-wrapper -->
|
||||
<div class="page-content-wrapper">
|
||||
{{defineZone "contentTitle"}}
|
||||
<div class="container-fluid body-wrapper">
|
||||
{{defineZone "content"}}
|
||||
<div class="container-fluid ">
|
||||
<div class="body-wrapper">
|
||||
{{defineZone "content"}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /page-content-wrapper -->
|
||||
|
||||
@ -19,38 +19,40 @@
|
||||
{{unit "cdmf.unit.ui.title" pageTitle="Login"}}
|
||||
|
||||
{{#zone "content"}}
|
||||
<div class="container col-xs-12 col-sm-6 col-md-6 col-lg-3 col-centered wr-content wr-login col-centered">
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 col-sm-offset-3 col-md-offset-3 col-lg-offset-4">
|
||||
|
||||
<p class="page-sub-title">Login</p>
|
||||
<hr />
|
||||
{{#if message}}
|
||||
<div class="alert alert-danger" style="padding-right: 15px;">
|
||||
<i class="icon fw fw-warning"></i> {{message}}!
|
||||
<p class="page-sub-title">Login</p>
|
||||
<hr />
|
||||
{{#if message}}
|
||||
<div class="alert alert-danger" style="padding-right: 15px;">
|
||||
<i class="icon fw fw-warning"></i> {{message}}!
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
<div class="panel-body">
|
||||
<form id="signInForm" method="POST" action="{{@app.context}}/uuf/login">
|
||||
<div class="form-group">
|
||||
<label for="username">Username *</label>
|
||||
<input type="text" name="username" class="form-control" placeholder="Enter your username"
|
||||
autofocus="autofocus" required="required" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="password">Password *</label>
|
||||
<input type="password" name="password" class="form-control" placeholder="Enter your password"
|
||||
required="required" />
|
||||
</div>
|
||||
{{#if referer}}
|
||||
<input type="hidden" name="referer" value="{{referer}}" />
|
||||
{{/if}}
|
||||
<div class="wr-input-control wr-btn-grp">
|
||||
<button class="wr-btn btn-download-agent">
|
||||
Login
|
||||
</button>
|
||||
{{defineZone "signInForm-below" scope="protected"}}
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
<div class="panel-body">
|
||||
<form id="signInForm" method="POST" action="{{@app.context}}/uuf/login">
|
||||
<div class="form-group">
|
||||
<label for="username">Username *</label>
|
||||
<input type="text" name="username" class="form-control" placeholder="Enter your username"
|
||||
autofocus="autofocus" required="required" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="password">Password *</label>
|
||||
<input type="password" name="password" class="form-control" placeholder="Enter your password"
|
||||
required="required" />
|
||||
</div>
|
||||
{{#if referer}}
|
||||
<input type="hidden" name="referer" value="{{referer}}" />
|
||||
{{/if}}
|
||||
<div class="wr-input-control wr-btn-grp">
|
||||
<button class="wr-btn btn-download-agent">
|
||||
Login
|
||||
</button>
|
||||
{{defineZone "signInForm-below" scope="protected"}}
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
{{/zone}}
|
||||
@ -17,7 +17,7 @@
|
||||
}}
|
||||
{{#zone "navMenu-icon"}}
|
||||
<span class="icon fw-stack">
|
||||
<i class="fw fw-tiles fw-stack-1x toggle-icon-up"></i>
|
||||
<i class="fw fw-menu fw-stack-1x toggle-icon-down"></i>
|
||||
</span>
|
||||
{{/zone}}
|
||||
|
||||
@ -105,8 +105,7 @@
|
||||
data-offset-top="80">
|
||||
<ul class="sidebar-messages">
|
||||
</ul>
|
||||
<h4 class="text-center"><a href="{{appContext}}notification-listing" class="text-center">Show all notifications</a>
|
||||
</h4>
|
||||
<div class="text-center"><a href="{{appContext}}notification-listing" class="btn btn-primary">Show all notifications</a></div>
|
||||
</div>
|
||||
{{/zone}}
|
||||
{{#zone "bottomJs"}}
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
font-weight: 100;
|
||||
}
|
||||
|
||||
|
||||
.wr-input-control .cus-col-25 {
|
||||
float: left;
|
||||
width: 25%;
|
||||
|
||||
@ -734,10 +734,6 @@ header .brand h1 {
|
||||
text-transform: uppercase;
|
||||
}
|
||||
|
||||
header .auth {
|
||||
margin: 0 -15px;
|
||||
}
|
||||
|
||||
header .dropdown {
|
||||
display: inline-block;
|
||||
color: #ffffff;
|
||||
@ -859,7 +855,7 @@ header .dropdown[aria-expanded=true], header .dropdown:hover {
|
||||
line-height: 50px;
|
||||
text-transform: uppercase;
|
||||
background: #010F1F;
|
||||
height: 50px;
|
||||
height: 40px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
@ -3606,7 +3602,6 @@ a.cu-btn, a.cu-btn-inner {
|
||||
font-weight:400;
|
||||
display: inline-block;
|
||||
text-transform: uppercase;
|
||||
height: 53px;
|
||||
padding: 13px 10px;
|
||||
}
|
||||
|
||||
@ -5051,6 +5046,7 @@ a.wr-side-panel-toggle-btn.selected {
|
||||
height: 100%;
|
||||
background: #ffffff;
|
||||
border: 1px solid #e8e8e8;
|
||||
margin-bottom:40px;
|
||||
}
|
||||
|
||||
.wr-advance-operations .row:first-child {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{
|
||||
"version": "1.0.0",
|
||||
"extends": "uuf.unit.theme"
|
||||
"extends": "uuf.unit.theme",
|
||||
"enabled": false
|
||||
}
|
||||
@ -46,8 +46,10 @@
|
||||
<!-- page-content-wrapper -->
|
||||
<div class="page-content-wrapper">
|
||||
{{defineZone "contentTitle"}}
|
||||
<div class="container-fluid body-wrapper">
|
||||
{{defineZone "content"}}
|
||||
<div class="container-fluid ">
|
||||
<div class="body-wrapper">
|
||||
{{defineZone "content"}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /page-content-wrapper -->
|
||||
|
||||
@ -35,8 +35,10 @@
|
||||
|
||||
<!-- page-content-wrapper -->
|
||||
<div class="page-content-wrapper">
|
||||
<div class="container-fluid body-wrapper">
|
||||
{{defineZone "content"}}
|
||||
<div class="container-fluid ">
|
||||
<div class="body-wrapper">
|
||||
{{defineZone "content"}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /page-content-wrapper -->
|
||||
|
||||
@ -16,22 +16,29 @@
|
||||
under the License.
|
||||
}}
|
||||
{{#zone "userMenu"}}
|
||||
<a href="#" class="dropdown" data-toggle="dropdown">
|
||||
<span class="hidden-xs add-padding-left-3x">
|
||||
{{@user.username}}<span class="caret"></span>
|
||||
</span>
|
||||
<span class="icon fw-stack fw-lg"><i class="fw fw-user fw-stack-1x"></i></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
|
||||
role="menu">
|
||||
<li class="dropdown-header visible-xs">
|
||||
{{@user.username}}<span class="caret"></span>
|
||||
<ul class="nav navbar-right float-remove-xs text-center-xs">
|
||||
<li class="visible-inline-block">
|
||||
<a href="#" class="dropdown" data-toggle="dropdown">
|
||||
<span class="icon fw-stack fw-lg">
|
||||
<i class="fw fw-circle fw-stack-2x"></i>
|
||||
<i class="fw fw-user fw-stack-1x fw-inverse"></i>
|
||||
</span>
|
||||
<span class="hidden-xs add-padding-left-1x">
|
||||
{{@user.username}}<span class="caret"></span>
|
||||
</span>
|
||||
</a>
|
||||
<ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
|
||||
role="menu">
|
||||
<li class="dropdown-header visible-xs">
|
||||
{{@user.username}}<span class="caret"></span>
|
||||
</li>
|
||||
<li class="divider visible-xs"></li>
|
||||
{{#defineZone "userMenu-items"}}
|
||||
<li>
|
||||
<a href="{{@app.context}}/signout">Sign Out</a>
|
||||
</li>
|
||||
{{/defineZone}}
|
||||
</ul>
|
||||
</li>
|
||||
<li class="divider visible-xs"></li>
|
||||
{{#defineZone "userMenu-items"}}
|
||||
<li>
|
||||
<a href="{{@app.context}}/signout">Sign Out</a>
|
||||
</li>
|
||||
{{/defineZone}}
|
||||
</ul>
|
||||
{{/zone}}
|
||||
File diff suppressed because it is too large
Load Diff
@ -622,10 +622,6 @@ header .brand {
|
||||
}
|
||||
}
|
||||
|
||||
header .auth {
|
||||
margin: 0 -15px;
|
||||
}
|
||||
|
||||
header .dropdown {
|
||||
display: inline-block;
|
||||
color: @base-light-color;
|
||||
|
||||
@ -26,6 +26,7 @@
|
||||
{{~css "lib/font-wso2_1.2/css/font-wso2.css" combine=false}}
|
||||
<!-- Theme LESS -->
|
||||
{{~css "less/theme.less" combine=false}}
|
||||
{{~css "css/theme-wso2.css"}}
|
||||
{{/zone}}
|
||||
|
||||
{{~#zone "topJs"}}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user