fix(app generator): fix default for modelName when collectionName set…

…tled as command line option
marviq · May 18, 2015 · 4ad52ac · 4ad52ac
1 parent ed924bd
commit 4ad52ac
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/generators/collection/index.js b/generators/collection/index.js
@@ -132,7 +132,12 @@ var CollectionGenerator = generators.Base.extend(
                             ,   message:    'What is the model name for this collection?'
                             ,   default: function ( answers )
                                 {
-                                    return ( youtil.definedToString( this.options.modelName ) || answers.collectionName );
+                                    return (
+                                        youtil.definedToString( this.options.modelName )
+                                    ||  answers.collectionName
+                                    ||  youtil.definedToString( this.options.collectionName )
+                                    );
+
                                 }.bind( this )
                             ,   validate:   youtil.isIdentifier
                             ,   filter: function ( value )