|
@@ -58,7 +58,7 @@ discard block |
|
|
block discarded – undo |
|
58
|
58
|
|
|
59
|
59
|
$rules = [ |
|
60
|
60
|
'type' => ['required', 'in:moveAfter,moveBefore'], |
|
61
|
|
- 'entityName' => ['required', 'in:' . implode(',', array_keys($sortableEntities))], |
|
|
61
|
+ 'entityName' => ['required', 'in:'.implode(',', array_keys($sortableEntities))], |
|
62
|
62
|
'id' => 'required', |
|
63
|
63
|
'positionEntityId' => 'required', |
|
64
|
64
|
]; |
|
@@ -76,20 +76,20 @@ discard block |
|
|
block discarded – undo |
|
76
|
76
|
$primaryKey = with(new $entityClass())->getKeyName(); |
|
77
|
77
|
|
|
78
|
78
|
if (!empty($connectionName)) { |
|
79
|
|
- $tableName = $connectionName . '.' . $tableName; |
|
|
79
|
+ $tableName = $connectionName.'.'.$tableName; |
|
80
|
80
|
} |
|
81
|
81
|
|
|
82
|
82
|
if (!$relation) { |
|
83
|
|
- $rules['id'] .= '|exists:' . $tableName . ',' . $primaryKey; |
|
84
|
|
- $rules['positionEntityId'] .= '|exists:' . $tableName . ',' . $primaryKey; |
|
|
83
|
+ $rules['id'] .= '|exists:'.$tableName.','.$primaryKey; |
|
|
84
|
+ $rules['positionEntityId'] .= '|exists:'.$tableName.','.$primaryKey; |
|
85
|
85
|
} else { |
|
86
|
86
|
/** @var BelongsToSortedMany $relationObject */ |
|
87
|
87
|
$relationObject = with(new $entityClass())->$relation(); |
|
88
|
88
|
$pivotTable = $relationObject->getTable(); |
|
89
|
89
|
|
|
90
|
|
- $rules['parentId'] = 'required|exists:' . $tableName . ',' . $primaryKey; |
|
91
|
|
- $rules['id'] .= '|exists:' . $pivotTable . ',' . $relationObject->getRelatedKey() . ',' . $relationObject->getForeignKey() . ',' . $request->input('parentId'); |
|
92
|
|
- $rules['positionEntityId'] .= '|exists:' . $pivotTable . ',' . $relationObject->getRelatedKey() . ',' . $relationObject->getForeignKey() . ',' . $request->input('parentId'); |
|
|
90
|
+ $rules['parentId'] = 'required|exists:'.$tableName.','.$primaryKey; |
|
|
91
|
+ $rules['id'] .= '|exists:'.$pivotTable.','.$relationObject->getRelatedKey().','.$relationObject->getForeignKey().','.$request->input('parentId'); |
|
|
92
|
+ $rules['positionEntityId'] .= '|exists:'.$pivotTable.','.$relationObject->getRelatedKey().','.$relationObject->getForeignKey().','.$request->input('parentId'); |
|
93
|
93
|
} |
|
94
|
94
|
|
|
95
|
95
|
return $validator->make($request->all(), $rules); |
boxfrommars /
rutorika-sortable
