merge relation in getNameAttributes

ommu · Oct 30, 2018 · 5430b0f · 5430b0f
1 parent 4835fcb
commit 5430b0f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/crud/Generator.php b/crud/Generator.php
@@ -272,7 +272,7 @@ public function getNameAttributes($table, $separator='->')
 					$relationTableName = trim($foreignKeys[$column->name]);
 					if(!$foreignCondition) {
 						$relationColumn[$column->name] = $this->setRelation($column->name);
-						$relationColumn[] = $this->getNameAttributes($db->getTableSchema($relationTableName), $separator);
+						$relationColumn = \yii\helpers\ArrayHelper::merge($relationColumn, $this->getNameAttributes($db->getTableSchema($relationTableName), $separator));
 						$foreignCondition = 1;
 					}
 				}

diff --git a/crud/gentelella/views/_search.php b/crud/gentelella/views/_search.php
@@ -85,10 +85,10 @@
 		echo "\t\t<?php ".$generator->generateActiveSearchField($column->name).";?>\n\n";
 }
 ?>
-	<div class="form-group">
-		<?= "<?= " ?>Html::submitButton(<?= $generator->generateString('Search') ?>, ['class' => 'btn btn-primary']) ?>
-		<?= "<?= " ?>Html::resetButton(<?= $generator->generateString('Reset') ?>, ['class' => 'btn btn-default']) ?>
-	</div>
+		<div class="form-group">
+			<?= "<?php echo " ?>Html::submitButton(<?= $generator->generateString('Search') ?>, ['class' => 'btn btn-primary']) ?>
+			<?= "<?php echo " ?>Html::resetButton(<?= $generator->generateString('Reset') ?>, ['class' => 'btn btn-default']) ?>
+		</div>
 
 	<?= "<?php " ?>ActiveForm::end(); ?>
 

diff --git a/model/Generator.php b/model/Generator.php
@@ -338,14 +338,15 @@ public function generateRules($table)
     {
         $types = [];
         $lengths = [];
+		$foreignKeys = $this->getForeignKeys($table->foreignKeys);
         foreach ($table->columns as $column) {
             if ($column->name[0] == '_') {
                 continue;
             }
             if ($column->autoIncrement) {
                 continue;
             }
-            if (!$column->allowNull && $column->defaultValue === null && $column->comment != 'trigger' && !in_array($column->name, array('creation_id','modified_id','slug'))) {
+            if ((!empty($foreignKeys) && array_key_exists($column->name, $foreignKeys)) || (!$column->allowNull && $column->defaultValue === null && $column->comment != 'trigger' && !in_array($column->name, array('creation_id','modified_id','slug')))) {
                 $types['required'][] = $column->name;
             }
             switch ($column->type) {
@@ -1079,7 +1080,7 @@ public function getNameAttributes($table, $separator='->')
 					$relationTableName = trim($foreignKeys[$column->name]);
 					if(!$foreignCondition) {
 						$relationColumn[$column->name] = $this->setRelation($column->name);
-						$relationColumn[] = $this->getNameAttributes($db->getTableSchema($relationTableName), $separator);
+						$relationColumn = \yii\helpers\ArrayHelper::merge($relationColumn, $this->getNameAttributes($db->getTableSchema($relationTableName), $separator));
 						$foreignCondition = 1;
 					}
 				}