fix all cmd, ready to release new version

hunteryun · Nov 5, 2017 · c4ee636 · c4ee636
1 parent f2bb58a
commit c4ee636
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 19 deletions.
diff --git a/core/command/ContentTypeCreateCmd.php b/core/command/ContentTypeCreateCmd.php
@@ -103,6 +103,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
          '--core' => '1.x',
          '--package' => 'Custom',
          '--module-file' => 'yes',
+         '--dependencies' => '',
          'isContentType' => TRUE,
        );
 

diff --git a/core/command/ModuleCreateCmd.php b/core/command/ModuleCreateCmd.php
@@ -108,7 +108,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
        $core = $input->getOption('core');
        $package = $input->getOption('package');
        $moduleFile = $input->getOption('module-file');
-       $dependencies = explode(',', $input->getOption('dependencies'));
+       $dependencies = $input->getOption('dependencies') == '' ? '' : explode(',', $input->getOption('dependencies'));
        $isContentType = $input->getArgument('isContentType');
 
        $dir .= '/'.$machineName;

diff --git a/core/command/templates/ct-add.html b/core/command/templates/ct-add.html
@@ -21,10 +21,10 @@
                   <label class="layui-form-label"><?php print $field['lable']; ?></label>
                   <div class="layui-input-block">
                     <select name="<?php echo $field['name']; ?>">
-                    <?php foreach ($field['html_type_option'] as $h):?>
-              <option value="<?php echo $h['value']; ?>"><?php echo $h['lable']; ?></option>
-              <?php endforeach;?>
-                    </select>
+          <?php foreach ($field['html_type_option'] as $h):?>
+            <option value="<?php echo $h['value']; ?>"><?php echo $h['lable']; ?></option>
+          <?php endforeach;?>
+          </select>
                   </div>
               </div>
             <?php elseif($field['html_type'] == 'textarea'): ?>
@@ -50,10 +50,10 @@
               <div class="layui-form-item">
                   <label class="layui-form-label"><?php print $field['lable']; ?></label>
                   <div class="layui-input-block">
-                      <?php foreach ($field['html_type_option'] as $h):?>
-                          <input type="radio" name="<?php echo $field['name']; ?>" value="<?php echo $h['value']; ?>" title="<?php echo $h['lable']; ?>">
-                      <?php endforeach;?>
-                  </div>
+              <?php foreach ($field['html_type_option'] as $h):?>
+              <input type="radio" name="<?php echo $field['name']; ?>" value="<?php echo $h['value']; ?>" title="<?php echo $h['lable']; ?>">
+              <?php endforeach;?>
+                </div>
               </div>
             <?php elseif($field['html_type'] == 'file' || $field['html_type'] == 'image'): ?>
 

diff --git a/core/command/templates/ct-install.html b/core/command/templates/ct-install.html
@@ -15,13 +15,6 @@
         'not null' => TRUE,
         'description' => 'ID of <?php print $type; ?>.',
       ),
-      'title' => array(
-        'type' => 'varchar',
-        'length' => 60,
-        'not null' => TRUE,
-        'default' => '',
-        'description' => '<?php print $type; ?> title.',
-      ),
 <?php foreach($fields as $field): ?>
 <?php if($field['type'] == 'int'): ?>
       '<?php print $field['name']; ?>' => array(
@@ -45,7 +38,7 @@
         'description' => '<?php print $type; ?> <?php print $field['name']; ?>.',
       ),
       <?php else: ?>
-'<?php print $field['name']; ?>' => array(
+      '<?php print $field['name']; ?>' => array(
         'type' => 'varchar',
         'length' => <?php print $field['type_setting']['length']; ?>,
         'not null' => <?php print $field['type_setting']['notnull']; ?>,
@@ -54,7 +47,7 @@
       ),
 <?php endif; ?>
 <?php endforeach; ?>
-'uid' => array(
+      'uid' => array(
         'type' => 'varchar',
         'length' => 60,
         'not null' => TRUE,

diff --git a/core/command/templates/ctcontroller.php.html b/core/command/templates/ctcontroller.php.html
@@ -44,7 +44,7 @@
           <?php foreach($fields as $field): ?>
 '<?php print $field['name']; ?>' => $<?php print $field['name']; ?>,
           <?php endforeach; ?>
-          'uid' => $user->uid,
+'uid' => $user->uid,
           'created' => time(),
           'updated' => time(),
         ))