Merge pull request #1853 from wheels-dev/cli-fixes

Cli fixes

Author: zainforbjs

cli/src/commands/wheels/generate/code.cfc

@@ -56,7 +56,13 @@ component aliases="wheels g controller" extends="../base" {
 
         if (hasCustomActions) {
             // HIGHEST PRIORITY: Custom actions specified
-            actionList = listToArray(arguments.actions);
+            actionList = listToArray(trim(arguments.actions));
+            // Remove empty elements and trim each action
+            actionList = actionList.map(function(action) {
+                return trim(action);
+            }).filter(function(action) {
+                return len(action) > 0;
+            });
         } else if (arguments.crud) {
             if (arguments.api) {
                 // API: No form actions (new, edit)
@@ -144,4 +150,4 @@ component aliases="wheels g controller" extends="../base" {
             setExitCode(1);
         }
     }
-}
+}

cli/src/commands/wheels/generate/controller.cfc

@@ -287,17 +287,17 @@ result = #functionList[1]#("some input");
 
     private string function generateHighlightFunction() {
         var content = chr(9) & chr(9) & "// Highlight search terms in text" & chr(10);
-        content &= chr(9) & chr(9) & "local.searchTerm = arguments.options.term ?: """";" & chr(10);
+        content &= chr(9) & chr(9) & "local.term = arguments.options.term ?: """";" & chr(10);
         content &= chr(9) & chr(9) & "local.highlightClass = arguments.options.class ?: ""highlight"";" & chr(10);
         content &= chr(10);
-        content &= chr(9) & chr(9) & "if (!len(local.searchTerm)) {" & chr(10);
+        content &= chr(9) & chr(9) & "if (!len(local.term)) {" & chr(10);
         content &= chr(9) & chr(9) & chr(9) & "return arguments.value;" & chr(10);
         content &= chr(9) & chr(9) & "}" & chr(10);
         content &= chr(10);
         content &= chr(9) & chr(9) & "return reReplaceNoCase(" & chr(10);
         content &= chr(9) & chr(9) & chr(9) & "arguments.value," & chr(10);
-        content &= chr(9) & chr(9) & chr(9) & """(#local.searchTerm#)""," & chr(10);
-        content &= chr(9) & chr(9) & chr(9) & """<span class=\""#local.highlightClass#\"">\\1</span>""," & chr(10);
+        content &= chr(9) & chr(9) & chr(9) & """('' & local.term & '')""," & chr(10);
+        content &= chr(9) & chr(9) & chr(9) & """<span class=''' & local.highlightClass & '''>\\1</span>""," & chr(10);
         content &= chr(9) & chr(9) & chr(9) & """all""" & chr(10);
         content &= chr(9) & chr(9) & ");" & chr(10);
         return content;

cli/src/commands/wheels/generate/helper.cfc

@@ -131,7 +131,8 @@ component aliases='wheels g model' extends="../base" {
                             name = arguments.name,
                             properties = parsedProperties,
                             baseDirectory = getCWD(),
-                            tableName = arguments.tableName
+                            tableName = arguments.tableName,
+                            primaryKey = arguments.primaryKey
                         );
                     } else {
                         var actualTableName = len(arguments.tableName) ? arguments.tableName : helpers.pluralize(lCase(arguments.name));
@@ -176,7 +177,13 @@ component aliases='wheels g model' extends="../base" {
         var properties = [];
 
         if (len(arguments.propertiesString)) {
-            var propList = listToArray(arguments.propertiesString);
+            var propList = listToArray(trim(arguments.propertiesString));
+            // Remove empty elements and trim each property
+            propList = propList.map(function(prop) {
+                return trim(prop);
+            }).filter(function(prop) {
+                return len(prop) > 0;
+            });
 
             for (var prop in propList) {
                 var parts = listToArray(prop, ":");
@@ -264,4 +271,4 @@ component aliases='wheels g model' extends="../base" {
 
         return arguments.properties;
     }
-}
+}