From 434222c4998df22b1a799b66dcf05969670f631e Mon Sep 17 00:00:00 2001 From: Nicolas Brassard Date: Wed, 7 Oct 2015 18:41:20 -0400 Subject: [PATCH 1/4] whitespace --- extension.driver.php | 2 +- fields/field.order_entries.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extension.driver.php b/extension.driver.php index 5d66c03..609309e 100644 --- a/extension.driver.php +++ b/extension.driver.php @@ -273,7 +273,7 @@ public function update($previousVersion) { $fields = Symphony::Database()->fetchCol('field_id',"SELECT field_id FROM `tbl_fields_order_entries`"); - foreach ($fields as $key => $field) { + foreach ($fields as $key => $field) { $status[] = Symphony::Database()->query(" ALTER TABLE `tbl_entries_data_{$field}` DROP INDEX `entry_id` diff --git a/fields/field.order_entries.php b/fields/field.order_entries.php index d47753b..5e1c9f5 100644 --- a/fields/field.order_entries.php +++ b/fields/field.order_entries.php @@ -208,7 +208,7 @@ private function updateFilterTable(){ // fetch existing table schema $currentFilters = Symphony::Database()->fetchCol('Field',"SHOW COLUMNS FROM tbl_entries_data_{$orderFieldId} WHERE Field like 'field_%';"); - + //change the value format to match the filtered fields stored foreach ($currentFilters as $key => $value) { $currentFilter = substr($value, 6); @@ -354,7 +354,7 @@ public function checkPostFieldData($data, &$message, $entry_id = null) { $numeric = array_filter($data['value'],'is_numeric'); if (sizeof($numeric) != sizeof($data['value'])){ $message = __('Must be a number.'); - return self::__INVALID_FIELDS__; + return self::__INVALID_FIELDS__; } } else if(strlen($data) > 0 && !is_numeric($data)) { $message = __('Must be a number.'); From 1ae4a968b85bec5163ff378128b1c036aaaef980 Mon Sep 17 00:00:00 2001 From: Jon Mifsud Date: Fri, 13 Nov 2015 07:42:48 +0100 Subject: [PATCH 2/4] do not set a value for null filters --- fields/field.order_entries.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fields/field.order_entries.php b/fields/field.order_entries.php index 5e1c9f5..1fd524a 100644 --- a/fields/field.order_entries.php +++ b/fields/field.order_entries.php @@ -299,7 +299,7 @@ function displayPublishPanel(&$wrapper, $data = null, $flagWithError = null, $fi foreach ($row as $key => $value) { $input = Widget::Input( 'fields' . $fieldnamePrefix . '[' . $this->get('element_name') . '][' . $col . '][' . $key . ']' . $fieldnamePostfix, - (strlen($value) !== 0 ? (string)$value : (string)++$max_position["max"]), + (strlen($value) !== 0 || $col != 'value') ? (string)$value : (string)++$max_position["max"], ($this->get('hide') == 'yes' || $col != 'value') ? 'hidden' : 'text' ); $inputs->appendChild($input); From 9bb8a32f4ec807ad86c7d22dc0df3881a2e1f3c4 Mon Sep 17 00:00:00 2001 From: Jon Mifsud Date: Fri, 20 Nov 2015 08:40:30 +0100 Subject: [PATCH 3/4] add new version for patch release --- extension.meta.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extension.meta.xml b/extension.meta.xml index 6a378fe..5ba7ea8 100644 --- a/extension.meta.xml +++ b/extension.meta.xml @@ -18,9 +18,15 @@ + + - Fix bug where value was also being set for null filters + - Bug fixes (#69, #72, #73) + + - Fix bug where value was also being set for null filters + - Added filtered ordering - Bug fixes From 3fe40d70914baf8e9e86ababd2572a13769826da Mon Sep 17 00:00:00 2001 From: Nicolas Brassard Date: Fri, 20 Nov 2015 17:17:10 -0500 Subject: [PATCH 4/4] removed duplicate 2.3.2 --- extension.meta.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/extension.meta.xml b/extension.meta.xml index 5ba7ea8..03fc5a0 100644 --- a/extension.meta.xml +++ b/extension.meta.xml @@ -24,9 +24,6 @@ - Bug fixes (#69, #72, #73) - - - Fix bug where value was also being set for null filters - - Added filtered ordering - Bug fixes