Make sure modTemplateVar is set before content in the gitify file (#88

)
modmore · Sep 15, 2015 · 32221a3 · 32221a3
1 parent a2b841e
commit 32221a3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 Changes that may have an impact on backwards compatibility (i.e. they may break existing workflows) are marked with `[BC]`.
 
 ## Current development (master)
+- Make sure `modTemplateVar` is set before content in the gitify file (#88)
 - Add `modTemplateVarResource` to default `truncate_on_force` for content to make sure the DB is cleaned properly on force (#111) 
 - Store installed packages with the full signature instead of just the package name (#110)
 - Add `modx:upgrade` command to download a newer version and to run the upgrade (#116)

diff --git a/src/Command/InitCommand.php b/src/Command/InitCommand.php
@@ -108,6 +108,18 @@ protected function execute(InputInterface $input, OutputInterface $output)
             );
         }
 
+        $question = new ConfirmationQuestion('Would you like to include <info>Template Variables</info>? <comment>(Y/N)</comment> ', true);
+        if ($helper->ask($input, $output, $question)) {
+            $dataTypes['template_variables'] = array(
+                'class' => 'modTemplateVar',
+                'primary' => 'name',
+            );
+            $dataTypes['template_variables_access'] = array(
+                'class' => 'modTemplateVarTemplate',
+                'primary' => array('tmplvarid', 'templateid')
+            );
+        }
+
         $question = new ConfirmationQuestion('Would you like to include <info>Content</info>? <comment>(Y/N)</comment> ', true);
         if ($helper->ask($input, $output, $question)) {
             $dataTypes['content'] = array(
@@ -135,18 +147,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
             );
         }
 
-        $question = new ConfirmationQuestion('Would you like to include <info>Template Variables</info>? <comment>(Y/N)</comment> ', true);
-        if ($helper->ask($input, $output, $question)) {
-            $dataTypes['template_variables'] = array(
-                'class' => 'modTemplateVar',
-                'primary' => 'name',
-            );
-            $dataTypes['template_variables_access'] = array(
-                'class' => 'modTemplateVarTemplate',
-                'primary' => array('tmplvarid', 'templateid')
-            );
-        }
-
         $question = new ConfirmationQuestion('Would you like to include <info>Chunks</info>? <comment>(Y/N)</comment> ', true);
         if ($helper->ask($input, $output, $question)) {
             $dataTypes['chunks'] = array(