File tree Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Expand file tree Collapse file tree 2 files changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -78,6 +78,14 @@ module.exports = [
7878 attributes : { exclude : [ 'deletedAt' , 'deletedBy' ] } ,
7979 raw : true ,
8080 } ;
81+ const projectProductTemplateQuery = {
82+ where : {
83+ deletedAt : { $eq : null } ,
84+ disabled : false ,
85+ } ,
86+ attributes : { exclude : [ 'deletedAt' , 'deletedBy' ] } ,
87+ raw : true ,
88+ } ;
8189
8290 // when user query with includeAllReferred, return result with all used version of
8391 // Form, PriceConfig, PlanConfig
@@ -97,8 +105,8 @@ module.exports = [
97105 } ) . then ( ( latestVersionModels ) => {
98106 latestVersion = latestVersionModels ;
99107 return Promise . all ( [
100- models . ProjectTemplate . findAll ( query ) ,
101- models . ProductTemplate . findAll ( query ) ,
108+ models . ProjectTemplate . findAll ( projectProductTemplateQuery ) ,
109+ models . ProductTemplate . findAll ( projectProductTemplateQuery ) ,
102110 models . MilestoneTemplate . findAll ( query ) ,
103111 models . ProjectType . findAll ( query ) ,
104112 models . ProductCategory . findAll ( query ) ,
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ const projectTemplates = [
2626 priceConfig : { key : 'key1' , version : 1 } ,
2727 createdBy : 1 ,
2828 updatedBy : 1 ,
29+ disabled : false ,
2930 } ,
3031] ;
3132const productTemplates = [
You can’t perform that action at this time.
0 commit comments