Skip to content
This repository was archived by the owner on Jan 22, 2024. It is now read-only.

Commit 15ea4b5

Browse files
committed
fix some error handling when adding new items
1 parent 6de2ac9 commit 15ea4b5

2 files changed

Lines changed: 19 additions & 12 deletions

File tree

digexp-wcm-design/lib/wcm-authenticated-request.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,12 +334,15 @@ var authenticatedRequest = function(user, pass, options, postData) {
334334
deferred.resolve(data);
335335
}, function(err) {
336336
checkEndRequest();
337-
debugLogger.error(err);
338-
if (err.statusCode != undefined && err.statusCode == success_http_code) {
337+
if(options.path.indexOf("Prototype") && err.indexOf("Generic_Error_0")){
338+
deferred.resolve(postData);
339+
}
340+
else if (err.statusCode != undefined && err.statusCode == success_http_code) {
339341
// in this case this is an allowed success condition, so
340342
// resolve this promise
341343
deferred.resolve(null);
342344
} else {
345+
debugLogger.error(err);
343346
err = getErrorFromResponse(err);
344347
debugLogger.error("authenticatedRequest::err::" + err);
345348
deferred.reject(err);

digexp-wcm-design/lib/wcmOperations.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,10 @@ function createWcmItemFromPath(type, path, fileName){
517517
var name = pathComponents[compLength-1];
518518
var parentFolderPath = path.slice(0,path.lastIndexOf(Path.sep));
519519
var libName = pathComponents[0];
520-
if(compLength == 3 && type != wcmTypes.folder){
521-
createNewWcmItem( type, libName, name, fileName).then(function( entry ){
520+
if((compLength == 3 && type != wcmTypes.folder) ||
521+
(compLength == 4 && type != wcmTypes.workflowAction)||
522+
(compLength == 4 && type != wcmTypes.workflowStage)){
523+
createNewWcmItem( type, libName, name, fileName).then(function( entry ){
522524
deferred.resolve(entry);
523525
},function(err){
524526
debugLogger.error("CreateNewItem::err::"+err);
@@ -712,7 +714,7 @@ function createNewWcmItem(type, libraryName, name, fileName, parent ){
712714
}
713715
},function(err){
714716
debugLogger.error("SetJson::err::"+err);
715-
deferred.reject(err);
717+
deferred.resolve(postData.entry);
716718
});
717719
},function(err){
718720
debugLogger.error("GetLibrary::err::"+err);
@@ -773,7 +775,6 @@ function updateWcmElementsData(fileName){
773775
authRequest.setJson(uri, entry, 'Put').then(function(data){
774776
deferred.resolve(data);
775777
},function(err){
776-
debugLogger.error("updateWcmElementsData " + uri + " :Item ::name::"+ item.name);
777778
deferred.resolve(item);
778779
});
779780
}
@@ -805,13 +806,16 @@ function updateWcmItem(type, item, fileName){
805806
wcmTypes.numericComponent == type ||
806807
wcmTypes.jspComponent == type
807808
){
808-
authRequest.setJson(cRef, val.value, 'Put').then(function(data){
809-
deferred.resolve(data);
810-
},function(err){
811-
debugLogger.error("updateWcmElementsData " + uri + " :Item ::name::"+ item.name);
809+
if(cRef == undefined)
812810
deferred.resolve(item);
813-
});
814-
}
811+
else
812+
authRequest.setJson(cRef, val.value, 'Put').then(function(data){
813+
deferred.resolve(data);
814+
},function(err){
815+
debugLogger.error("updateWcmElementsData " + uri + " :Item ::name::"+ item.name);
816+
deferred.resolve(item);
817+
});
818+
}
815819
else
816820
if( cRef != undefined){
817821
authRequest.setContent(cRef, val.type, val.value).then(function(data){

0 commit comments

Comments
 (0)