Skip to content

[DD 2450] Accept api from state and call correct path for adding new user #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[DD 2450] Accept api from state and call correct path for adding new user #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
39ea1c8
[DD 2450] Accept api from state and call correct path for adding new …
Sep 26, 2017
97d485d
[DD-2450] Accept options object for save and saveWithFiles
Sep 28, 2017
e965246
DD-2450: Refactor code
Sep 29, 2017
04169ca
Refactor setting of api path in save function of GeneralModelService
Oct 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions client/app/dashboard/model/edit/ModelEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ angular.module('dashboard.Dashboard.Model.Edit', [
'ui.bootstrap',
'ui.bootstrap.datepicker',
'ui.bootstrap.modal',
'ngCookies'
'ngCookies'
])

.config(function config($stateProvider) {
Expand Down Expand Up @@ -69,7 +69,7 @@ angular.module('dashboard.Dashboard.Model.Edit', [

//Loop through fields and check for forced default fields
GeneralModelService.checkDefaultValues($scope.model, $scope.data);

//Check to see if editing model
var id = null;
if ($stateParams.id && $stateParams.id > 0) id = $stateParams.id;
Expand Down Expand Up @@ -125,7 +125,7 @@ angular.module('dashboard.Dashboard.Model.Edit', [
*/
function save(callback) {
var id = $scope.data[$scope.action.options.key];
GeneralModelService.saveWithFiles($scope.model.name, id, $scope.data)
GeneralModelService.saveWithFiles($scope.model.name, id, $scope.data, $scope.action.options.upsertApi)
.then(function(response) {
if (modalInstance) modalInstance.close();
$rootScope.$broadcast('modelEditSaved');
Expand Down Expand Up @@ -181,7 +181,7 @@ angular.module('dashboard.Dashboard.Model.Edit', [
}
});
};

$scope.clickDeleteModel = function(data, formParams) {
$scope.deleteDialogText = (formParams && formParams.deleteDialogText) ? formParams.deleteDialogText : $scope.deleteDialogText;
if (!confirm($scope.deleteDialogText)) return;
Expand Down Expand Up @@ -213,7 +213,7 @@ angular.module('dashboard.Dashboard.Model.Edit', [
});
}
};

/**
* Checks if the user access to edit the field for this Model
*/
Expand Down Expand Up @@ -247,7 +247,7 @@ angular.module('dashboard.Dashboard.Model.Edit', [
if (!$cookies.roles) {
return false; //user has no role access
}

var userRoles = JSON.parse($cookies.roles);
for (var i in userRoles) {
var role = userRoles[i];
Expand All @@ -257,7 +257,7 @@ angular.module('dashboard.Dashboard.Model.Edit', [
}
return false;
};

init();
})

Expand Down
9 changes: 5 additions & 4 deletions client/common/services/GeneralModelService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ angular.module('dashboard.services.GeneralModel', [
* The CMS exposes the /model/save API that can take in model data
* in hierarchical format
*/
this.save = function(model, id, params) {
var path = Config.serverParams.cmsBaseUrl + '/model/save';
this.save = function(model, id, params, upsertApi) {
var path = upsertApi || Config.serverParams.cmsBaseUrl + '/model/save';
params.__model = model;
params.__id = id;
params.__accessToken = $cookies.accessToken;
Expand All @@ -112,9 +112,10 @@ angular.module('dashboard.services.GeneralModel', [
* @param model
* @param id
* @param data
* @param upsertApi
* @returns {promise.promise|Function|deferred.promise|{then, catch, finally}|*|r.promise}
*/
this.saveWithFiles = function(model, id, data) {
this.saveWithFiles = function(model, id, data, upsertApi) {
var modelDef = Config.serverParams.models[model];
var deferred = $q.defer();

Expand Down Expand Up @@ -179,7 +180,7 @@ angular.module('dashboard.services.GeneralModel', [
uploadFiles(function() {
//Loop through fields and check for forced default fields
self.checkDefaultValues(modelDef, data);
self.save(model, id, data).then(
self.save(model, id, data, upsertApi).then(
function(result) {
deferred.resolve(result);
},
Expand Down