Skip to content

Commit 38406b9

Browse files
author
vikasrohit
authored
Merge pull request #167 from topcoder-platform/dev
Adding capability for deleting keys in json object of project template
2 parents 277ae66 + 67c5d40 commit 38406b9

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

migrations/20180608_project_add_templateId_and_new_tables.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ CREATE TABLE product_milestone_templates (
113113
"activeText" character varying(512) NOT NULL,
114114
"blockedText" character varying(512) NOT NULL,
115115
"completedText" character varying(512) NOT NULL,
116+
"hidden" boolean DEFAULT false,
116117
"deletedAt" timestamp with time zone,
117118
"createdAt" timestamp with time zone,
118119
"updatedAt" timestamp with time zone,

src/routes/projectTemplates/update.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@ module.exports = [
6666
// Merge JSON fields
6767
entityToUpdate.scope = util.mergeJsonObjects(projectTemplate.scope, entityToUpdate.scope);
6868
entityToUpdate.phases = util.mergeJsonObjects(projectTemplate.phases, entityToUpdate.phases);
69+
// removes null phase templates
70+
entityToUpdate.phases = _.omitBy(entityToUpdate.phases, _.isNull);
6971

7072
return projectTemplate.update(entityToUpdate);
7173
})

src/routes/projects/create.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function createProjectAndPhases(req, project, projectTemplate, productTemplates)
8787
if (!projectTemplate) {
8888
return Promise.resolve(result);
8989
}
90-
const phases = _.values(projectTemplate.phases);
90+
const phases = _.filter(_.values(projectTemplate.phases), p => !!p);
9191
const productTemplateMap = {};
9292
productTemplates.forEach((pt) => {
9393
productTemplateMap[pt.id] = pt;

0 commit comments

Comments
 (0)