resolving conflicts

revert-70aa11f8
madhawap 8 years ago
commit d62a9c8b83

@ -82,16 +82,17 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
int rows; int rows;
try { try {
conn = this.getConnection(); conn = this.getConnection();
String sql = "UPDATE DM_DEVICE SET DESCRIPTION = ?, LAST_UPDATED_TIMESTAMP = ? " + String sql = "UPDATE DM_DEVICE SET NAME = ?, DESCRIPTION = ?, LAST_UPDATED_TIMESTAMP = ? " +
"WHERE DEVICE_TYPE_ID = (SELECT ID FROM DM_DEVICE_TYPE WHERE NAME = ? AND PROVIDER_TENANT_ID = ?) " + "WHERE DEVICE_TYPE_ID = (SELECT ID FROM DM_DEVICE_TYPE WHERE NAME = ? AND PROVIDER_TENANT_ID = ?) " +
"AND DEVICE_IDENTIFICATION = ? AND TENANT_ID = ?"; "AND DEVICE_IDENTIFICATION = ? AND TENANT_ID = ?";
stmt = conn.prepareStatement(sql, new String[] {"id"}); stmt = conn.prepareStatement(sql, new String[] {"id"});
stmt.setString(1, device.getDescription()); stmt.setString(1, device.getName());
stmt.setTimestamp(2, new Timestamp(new Date().getTime())); stmt.setString(2, device.getDescription());
stmt.setString(3, device.getType()); stmt.setTimestamp(3, new Timestamp(new Date().getTime()));
stmt.setInt(4, tenantId); stmt.setString(4, device.getType());
stmt.setString(5, device.getDeviceIdentifier()); stmt.setInt(5, tenantId);
stmt.setInt(6, tenantId); stmt.setString(6, device.getDeviceIdentifier());
stmt.setInt(7, tenantId);
rows = stmt.executeUpdate(); rows = stmt.executeUpdate();
return (rows > 0); return (rows > 0);
} catch (SQLException e) { } catch (SQLException e) {

@ -275,7 +275,9 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
Device currentDevice = deviceDAO.getDevice(deviceIdentifier, tenantId); Device currentDevice = deviceDAO.getDevice(deviceIdentifier, tenantId);
device.setId(currentDevice.getId()); device.setId(currentDevice.getId());
device.getEnrolmentInfo().setId(currentDevice.getEnrolmentInfo().getId()); device.getEnrolmentInfo().setId(currentDevice.getEnrolmentInfo().getId());
if (device.getName() == null) {
device.setName(currentDevice.getName());
}
deviceDAO.updateDevice(device, tenantId); deviceDAO.updateDevice(device, tenantId);
enrollmentDAO.updateEnrollment(device.getEnrolmentInfo()); enrollmentDAO.updateEnrollment(device.getEnrolmentInfo());
DeviceManagementDAOFactory.commitTransaction(); DeviceManagementDAOFactory.commitTransaction();
@ -366,7 +368,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
} }
} catch (DeviceManagementDAOException e) { } catch (DeviceManagementDAOException e) {
throw new DeviceManagementException("Error occurred while obtaining the enrollment information device for" + throw new DeviceManagementException("Error occurred while obtaining the enrollment information device for" +
"id '" + deviceId.getId() + "'", e); "id '" + deviceId.getId() + "'", e);
} catch (SQLException e) { } catch (SQLException e) {
throw new DeviceManagementException("Error occurred while opening a connection to the data source", e); throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
} finally { } finally {
@ -877,7 +879,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
if (device == null) { if (device == null) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("No device is found upon the type '" + deviceId.getType() + "' and id '" + log.debug("No device is found upon the type '" + deviceId.getType() + "' and id '" +
deviceId.getId() + "'"); deviceId.getId() + "'");
} }
return null; return null;
} }
@ -890,7 +892,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
device.setApplications(applications); device.setApplications(applications);
} catch (DeviceManagementDAOException e) { } catch (DeviceManagementDAOException e) {
throw new DeviceManagementException("Error occurred while obtaining the device for id " + throw new DeviceManagementException("Error occurred while obtaining the device for id " +
"'" + deviceId.getId() + "'", e); "'" + deviceId.getId() + "'", e);
} catch (SQLException e) { } catch (SQLException e) {
throw new DeviceManagementException("Error occurred while opening a connection to the data source", e); throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
} catch (DeviceDetailsMgtDAOException e) { } catch (DeviceDetailsMgtDAOException e) {
@ -904,7 +906,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
if (deviceManager == null) { if (deviceManager == null) {
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Device Manager associated with the device type '" + deviceId.getType() + "' is null. " + log.debug("Device Manager associated with the device type '" + deviceId.getType() + "' is null. " +
"Therefore, not attempting method 'getDevice'"); "Therefore, not attempting method 'getDevice'");
} }
return device; return device;
} }
@ -1861,7 +1863,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
} }
} catch (DeviceManagementDAOException e) { } catch (DeviceManagementDAOException e) {
throw new DeviceManagementException("Error occurred while obtaining the enrollment information device for" + throw new DeviceManagementException("Error occurred while obtaining the enrollment information device for" +
"id '" + deviceId.getId() + "' and user : " + user, e); "id '" + deviceId.getId() + "' and user : " + user, e);
} catch (SQLException e) { } catch (SQLException e) {
throw new DeviceManagementException("Error occurred while opening a connection to the data source", e); throw new DeviceManagementException("Error occurred while opening a connection to the data source", e);
} finally { } finally {
@ -1929,8 +1931,8 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
/** /**
* Checks for the default group existence and create group based on device ownership * Checks for the default group existence and create group based on device ownership
* *
* @param service {@link GroupManagementProviderService} instance. * @param service {@link GroupManagementProviderService} instance.
* @param groupName of the group to create. * @param groupName of the group to create.
* @return Group with details. * @return Group with details.
* @throws GroupManagementException * @throws GroupManagementException
*/ */

@ -35,3 +35,14 @@ window.queryEditor = CodeMirror.fromTextArea(document.getElementById('policy-def
var validatePolicyProfile = function () { var validatePolicyProfile = function () {
return true; return true;
}; };
/**
* Generates policy profile feature list which will be saved with the profile.
*
* This function will be invoked from the relevant cdmf unit at the time of policy creation.
*
* @returns {Array} profile payloads
*/
var generateGenericPayload = function () {
return window.queryEditor.getValue();
};

@ -21,6 +21,7 @@ var policy = {};
var validateInline = {}; var validateInline = {};
var clearInline = {}; var clearInline = {};
var validateStep = {}; var validateStep = {};
var hasPolicyProfileScript = false;
var enableInlineError = function (inputField, errorMsg, errorSign) { var enableInlineError = function (inputField, errorMsg, errorSign) {
var fieldIdentifier = "#" + inputField; var fieldIdentifier = "#" + inputField;
@ -157,6 +158,9 @@ stepForwardFrom["policy-platform"] = function (actionButton) {
script.type = 'text/javascript'; script.type = 'text/javascript';
script.src = context + policyOperationsScriptSrc; script.src = context + policyOperationsScriptSrc;
$(".wr-advance-operations").prepend(script); $(".wr-advance-operations").prepend(script);
hasPolicyProfileScript = true;
} else {
hasPolicyProfileScript = false;
} }
if (policyOperationsStylesSrc) { if (policyOperationsStylesSrc) {
var style = document.createElement('link'); var style = document.createElement('link');
@ -172,11 +176,14 @@ stepForwardFrom["policy-platform"] = function (actionButton) {
* Forward action of policy profile page. Generates policy profile payload. * Forward action of policy profile page. Generates policy profile payload.
*/ */
stepForwardFrom["policy-profile"] = function () { stepForwardFrom["policy-profile"] = function () {
/* policy["profile"] = [];
generatePolicyProfile() function should be implemented in plugin side and should include the logic to build the if (hasPolicyProfileScript) {
policy profile object. /*
*/ generatePolicyProfile() function should be implemented in plugin side and should include the logic to build the
policy["profile"] = generatePolicyProfile(); policy profile object.
*/
policy["profile"] = generatePolicyProfile();
}
// updating next-page wizard title with selected platform // updating next-page wizard title with selected platform
$("#policy-criteria-page-wizard-title").text("ADD " + policy["platform"] + " POLICY"); $("#policy-criteria-page-wizard-title").text("ADD " + policy["platform"] + " POLICY");
}; };
@ -185,11 +192,13 @@ stepForwardFrom["policy-profile"] = function () {
* Backward action of policy profile page. Moves back to platform selection step. * Backward action of policy profile page. Moves back to platform selection step.
*/ */
stepBackFrom["policy-profile"] = function () { stepBackFrom["policy-profile"] = function () {
/* if (hasPolicyProfileScript) {
resetPolicyProfile() function should be implemented in plugin side and should include the logic to reset the policy /*
profile object. resetPolicyProfile() function should be implemented in plugin side and should include the logic to reset the policy
*/ profile object.
resetPolicyProfile(); */
resetPolicyProfile();
}
}; };
/** /**
@ -365,21 +374,26 @@ stepForwardFrom["policy-naming"] = function () {
}; };
var savePolicy = function (policy, isActive, serviceURL) { var savePolicy = function (policy, isActive, serviceURL) {
/* var profilePayloads;
generateProfileFeaturesList() should be implemented in the plugin side and should include logic to build the if (hasPolicyProfileScript) {
profilePayloads array which contains objects, {featureCode:"value", deviceType:"value", content:"value"}. /*
policy["profile"] object will be available for the method which returns from the generatePolicyProfile() function. generateProfileFeaturesList() should be implemented in the plugin side and should include logic to build the
*/ profilePayloads array which contains objects, {featureCode:"value", deviceType:"value", content:"value"}.
var profilePayloads = generateProfileFeaturesList(); policy["profile"] object will be available for the method which returns from the generatePolicyProfile() function.
*/
$.each(profilePayloads, function (i, item) { profilePayloads = generateProfileFeaturesList();
$.each(item.content, function (key, value) {
//cannot add a true check since it will catch value = false as well $.each(profilePayloads, function (i, item) {
if (value === null || value === undefined || value === "") { $.each(item.content, function (key, value) {
item.content[key] = null; //cannot add a true check since it will catch value = false as well
} if (value === null || value === undefined || value === "") {
item.content[key] = null;
}
});
}); });
}); } else {
profilePayloads = generateGenericPayload();
}
var payload = { var payload = {
"policyName": policy["policyName"], "policyName": policy["policyName"],

Loading…
Cancel
Save