mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-12 09:44:38 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#598 in FieldtypeOptions where manually assigned option IDs were not working

Browse Source
This commit is contained in:
Ryan Cramer
2018-05-23 07:45:33 -04:00
parent 91930953b6
commit c512fd68e3
2 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wire/core/DatabaseQuery.php
View File

@@ -18,7 +18,7 @@
*
* @property array $where
* @property array $bindValues
* @properety array $bindIndex
* @property array $bindIndex
*
*/
abstract class DatabaseQuery extends WireData {
@@ -216,6 +216,9 @@ abstract class DatabaseQuery extends WireData {
/**
* Execute the query with the current database handle
*
* @return \PDOStatement
* @throws WireException|\Exception|\PDOException
*
*/
public function execute() {

60
wire/modules/Fieldtype/FieldtypeOptions/SelectableOptionManager.php
View File

@@ -155,6 +155,8 @@ class SelectableOptionManager extends Wire {
$sorted[] = $option;
}
}
$query->closeCursor();
$options = $this->wire(new SelectableOptionArray());
$options->setField($field);
@@ -183,17 +185,20 @@ class SelectableOptionManager extends Wire {
// no need to use fulltext matching if operator is not a partial match operator
return $this->getOptions($field, array($property => $value));
}
/** @var DatabaseQuerySelect $query */
$query = $this->wire(new DatabaseQuerySelect());
$query->select('*');
$query->from(self::optionsTable);
$query->where("fields_id=:fields_id");
$query->bindValue(':fields_id', $field->id);
/** @var DatabaseQuerySelectFulltext $ft */
$ft = $this->wire(new DatabaseQuerySelectFulltext($query));
$ft->match(self::optionsTable, $property, $operator, $value);
$result = $query->execute();
/** @var SelectableOptionArray $options */
$options = $this->wire(new SelectableOptionArray());
$options->setField($field);
@@ -642,18 +647,35 @@ class SelectableOptionManager extends Wire {
*
*/
public function addOptions(Field $field, $options) {
/** @var WireDatabasePDO $database */
$database = $this->wire('database');
// options that have pre-assigned IDs
$optionsByID = array();
$sql =
"SELECT MAX(option_id) FROM " . self::optionsTable . " " .
"WHERE fields_id=:fields_id";
// determine if any added options already have IDs
foreach($options as $option) {
if(!$option instanceof SelectableOption || !strlen($option->title)) continue;
if($option->id > 0) $optionsByID[(int) $option->id] = $option;
}
if(count($options) > count($optionsByID)) {
// Determine starting value (max) for auto-assigned IDs
$sql =
"SELECT MAX(option_id) FROM " . self::optionsTable . " " .
"WHERE fields_id=:fields_id";
$query = $database->prepare($sql);
$query->bindValue(':fields_id', $field->id);
$query->execute();
$query = $database->prepare($sql);
$query->bindValue(':fields_id', $field->id);
$query->execute();
list($max) = $query->fetch(\PDO::FETCH_NUM);
list($max) = $query->fetch(\PDO::FETCH_NUM);
$query->closeCursor();
} else {
// there are no auto-assigned IDs
$max = 0;
}
$sql =
"INSERT INTO " . self::optionsTable . " " .
@@ -664,12 +686,16 @@ class SelectableOptionManager extends Wire {
$query = $database->prepare($sql);
foreach($options as $option) {
if(!strlen($option->title)) continue;
if(!$option instanceof SelectableOption) continue;
$id = ++$max;
$query->bindValue(':fields_id', $field->id);
$query->bindValue(':option_id', $id);
$query->bindValue(':sort', $option->sort);
if(!$option instanceof SelectableOption || !strlen($option->title)) continue;
if($option->id > 0) {
$id = $option->id;
} else {
$id = ++$max;
while(isset($optionsByID[$id])) $id++;
}
$query->bindValue(':fields_id', $field->id, \PDO::PARAM_INT);
$query->bindValue(':option_id', $id, \PDO::PARAM_INT);
$query->bindValue(':sort', $option->sort, \PDO::PARAM_INT);
$query->bindValue(':title', $option->title);
$query->bindValue(':value', $option->value);
@@ -696,7 +722,7 @@ class SelectableOptionManager extends Wire {
*
*/
public function updateLanguages(HookEvent $event = null) {
if($event) {} // ignore
if(!$this->useLanguages) return;
$database = $this->wire('database');