explicitly set sails.models namespace in hooks.orm.configure

firstteam · Jul 16, 2015 · 97780ae · 97780ae
1 parent 0a1dd6f
commit 97780ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/hooks/orm/index.js b/lib/hooks/orm/index.js
@@ -58,6 +58,7 @@ module.exports = function(sails) {
     },
 
     configure: function() {
+      sails.models = { };
 
       // Backwards compatibilty
       sails.config = backwardsCompatibleConfig(sails.config);

diff --git a/lib/hooks/orm/load-user-modules.js b/lib/hooks/orm/load-user-modules.js
@@ -22,7 +22,7 @@ module.exports = function howto_lookupUserModules (sails) {
         // Case-insensitive, using filename to determine identity
         sails.modules.loadModels(function modulesLoaded(err, modules) {
           if (err) return cb(err);
-          sails.models = _.extend(sails.models || {}, modules);
+          sails.models = _.extend(sails.models, modules);
           return cb();
         });
       },