Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLakshay arora <carefreelakshay97@gmail.com>2018-05-12 09:44:58 +0300
committerMaurĂ­cio Meneghini Fauth <mauriciofauth@gmail.com>2018-05-12 09:44:58 +0300
commit9231620c2de872bbdf5a21b63f084ad601d400d3 (patch)
tree42feb28199e2fbf6a0266444bb5e085300858a1d /templates
parent8bd91ffdaa5bfb3651749a6f97de51c1b67a005e (diff)
Fix for issues with spatial fields (#14125)
* Fix for issues with spatial fields Fixes the following issues: 1. #14068 SPATIAL fields with no unique index/autoincrement error when clicking This error occurs when there is no unique column to uniquely identify a tuple. I've disabled the geomtery view and made view as wkt the default view in such cases. 2. #14121 View spatial fields as WKT doesn't work 1. #14067 IS NULL search operator produces no WHERE SQL with spatial fields Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com> * Fix for issues with spatial fields This commit fixes view as BINARY not working in the previous commit. Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com> * Fix for issues with spatial fields Fixes typo in previous commits. Signed-Off-By: Lakshay arora <arora.lakshya123@gmail.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/display/results/options_block.twig48
1 files changed, 33 insertions, 15 deletions
diff --git a/templates/display/results/options_block.twig b/templates/display/results/options_block.twig
index b713616ccb..465f9e3467 100644
--- a/templates/display/results/options_block.twig
+++ b/templates/display/results/options_block.twig
@@ -73,22 +73,40 @@
} only %}
</div>
- <div class="formelement">
- {{ Util_getRadioFields(
- 'geoOption',
- {
- 'GEOM': 'Geometry'|trans,
- 'WKT': 'Well Known Text'|trans,
- 'WKB': 'Well Known Binary'|trans
- },
- geo_option,
- true,
- true,
- '',
- 'geoOption_' ~ unique_id
- ) }}
- </div>
+ {% if possible_as_geometry %}
+ <div class="formelement">
+ {{ Util_getRadioFields(
+ 'geoOption',
+ {
+ 'GEOM': 'Geometry'|trans,
+ 'WKT': 'Well Known Text'|trans,
+ 'WKB': 'Well Known Binary'|trans
+ },
+ geo_option,
+ true,
+ true,
+ '',
+ 'geoOption_' ~ unique_id
+ ) }}
+ </div>
+ {% else %}
+ <div class="formelement">
+ {{ possible_as_geometry }}
+ {{ Util_getRadioFields(
+ 'geoOption',
+ {
+ 'WKT': 'Well Known Text'|trans,
+ 'WKB': 'Well Known Binary'|trans
+ },
+ geo_option,
+ true,
+ true,
+ '',
+ 'geoOption_' ~ unique_id
+ ) }}
+ </div>
+ {% endif %}
<div class="clearfloat"></div>
</fieldset>