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 = [
78
78
attributes : { exclude : [ 'deletedAt' , 'deletedBy' ] } ,
79
79
raw : true ,
80
80
} ;
81
+ const projectProductTemplateQuery = {
82
+ where : {
83
+ deletedAt : { $eq : null } ,
84
+ disabled : false ,
85
+ } ,
86
+ attributes : { exclude : [ 'deletedAt' , 'deletedBy' ] } ,
87
+ raw : true ,
88
+ } ;
81
89
82
90
// when user query with includeAllReferred, return result with all used version of
83
91
// Form, PriceConfig, PlanConfig
@@ -97,8 +105,8 @@ module.exports = [
97
105
} ) . then ( ( latestVersionModels ) => {
98
106
latestVersion = latestVersionModels ;
99
107
return Promise . all ( [
100
- models . ProjectTemplate . findAll ( query ) ,
101
- models . ProductTemplate . findAll ( query ) ,
108
+ models . ProjectTemplate . findAll ( projectProductTemplateQuery ) ,
109
+ models . ProductTemplate . findAll ( projectProductTemplateQuery ) ,
102
110
models . MilestoneTemplate . findAll ( query ) ,
103
111
models . ProjectType . findAll ( query ) ,
104
112
models . ProductCategory . findAll ( query ) ,
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ const projectTemplates = [
26
26
priceConfig : { key : 'key1' , version : 1 } ,
27
27
createdBy : 1 ,
28
28
updatedBy : 1 ,
29
+ disabled : false ,
29
30
} ,
30
31
] ;
31
32
const productTemplates = [
You can’t perform that action at this time.
0 commit comments