|
|
@@ -61,23 +61,24 @@ module.exports = function(crowi) {
|
|
|
var UpdatePost = this;
|
|
|
var prefixes = UpdatePost.createPrefixesByPathPattern(path);
|
|
|
|
|
|
- return UpdatePost.find({$or: [
|
|
|
- {patternPrefix: prefixes[0], patternPrefix2: prefixes[1]},
|
|
|
- {patternPrefix: '*', patternPrefix2: '*'},
|
|
|
- {patternPrefix: prefixes[0], patternPrefix2: '*'},
|
|
|
- {patternPrefix: '*', patternPrefix2: prefixes[1]},
|
|
|
- ]})
|
|
|
- .then(function(settings) {
|
|
|
- if (settings.length <= 0) {
|
|
|
- return Promise.resolve(settings);
|
|
|
- }
|
|
|
-
|
|
|
- settings = settings.filter(function(setting) {
|
|
|
- var patternRegex = UpdatePost.getRegExpByPattern(setting.pathPattern);
|
|
|
- return pathPattern.test(path);
|
|
|
- });
|
|
|
+ return new Promise(function(resolve, reject) {
|
|
|
+ UpdatePost.find({$or: [
|
|
|
+ {patternPrefix: prefixes[0], patternPrefix2: prefixes[1]},
|
|
|
+ {patternPrefix: '*', patternPrefix2: '*'},
|
|
|
+ {patternPrefix: prefixes[0], patternPrefix2: '*'},
|
|
|
+ {patternPrefix: '*', patternPrefix2: prefixes[1]},
|
|
|
+ ]}).then(function(settings) {
|
|
|
+ if (settings.length <= 0) {
|
|
|
+ return resolve(settings);
|
|
|
+ }
|
|
|
|
|
|
- return Promise.resolve(settings);
|
|
|
+ settings = settings.filter(function(setting) {
|
|
|
+ var patternRegex = UpdatePost.getRegExpByPattern(setting.pathPattern);
|
|
|
+ return patternRegex.test(path);
|
|
|
+ });
|
|
|
+
|
|
|
+ return resolve(settings);
|
|
|
+ });
|
|
|
});
|
|
|
};
|
|
|
|