From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 6 Dec 2018 21:06:28 +0000 (-0500)
Subject: Fixed SQL error when submitting member info after a failed submit when no counties... 
X-Git-Tag: v2.11.0^2~46
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=5df8b83486fcaa4f3b832316d6774080cd384710;p=WP-Plugins%2Fglm-member-db.git

Fixed SQL error when submitting member info after a failed submit when no counties listed.
---

diff --git a/views/admin/member/memberInfo/editProfileAddress.html b/views/admin/member/memberInfo/editProfileAddress.html
index d4dba382..409183ab 100755
--- a/views/admin/member/memberInfo/editProfileAddress.html
+++ b/views/admin/member/memberInfo/editProfileAddress.html
@@ -53,6 +53,7 @@
                             <h4 {if $memberInfo.fieldRequired.county}class="glm-required"{/if}>County:</h4>
                             <div {if $memberInfo.fieldFail.county}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
                                 <select name="county">
+                                        <option value="0"{if $v.default} selected="selected"{/if}></option>
                                     {foreach from=$memberInfo.fieldData.county.list item=v}
                                         <option value="{$v.value}"{if $v.default} selected="selected"{/if}>{$v.name}</option>
                                     {/foreach}
@@ -117,18 +118,18 @@
                                     Click and drag anywhere else on the map to move to another area.
                                 </p>
                                 <p><div id="glm-estimate-location" class="button button-secondary">Map Location Using Above Address</div></p>
-                                
-                    {if $settings.selected_map_interface == 1} 
+
+                    {if $settings.selected_map_interface == 1}
                                 <!--  Leaflet Map -->
                                 <div id="LeafletMapContainer" style="height: 400px; width: 100%;"></div>
                     {/if}
-                    
-                    {if $settings.selected_map_interface == 2}            
+
+                    {if $settings.selected_map_interface == 2}
                                 <!-- Google Map -->
-                                <div id="GoogleMap" class="glm-map-edit-small" style="height: 400; width: 600px;">(map loads here)</div>               
+                                <div id="GoogleMap" class="glm-map-edit-small" style="height: 400; width: 600px;">(map loads here)</div>
                     {/if}
-                                
-                                
+
+
                                 <p>
                                     <h4>Specify Position Using Lattitude and Longitude:</h4>
                             		Latitude <input id="glmLat" name="lat" type="text" value="{$memberInfo.fieldData.lat}" class="glm-form-text-input-veryshort">
@@ -147,13 +148,13 @@
             /*
              * Map operations
              */
-             
+
             var startLat = $('#glmLat').val();
             var startLon = $('#glmLng').val();
             var defZoom = Number({$settings.maps_default_zoom});
-            
-    {if $settings.selected_map_interface == 1}    
-            
+
+    {if $settings.selected_map_interface == 1}
+
             /*
              *  Leaflet Map
              *  API reference: https://leafletjs.com/reference-1.3.2.html
@@ -168,7 +169,7 @@
                  var leafletMinZoom = 5;
                  var leafletMaxZoom = 18;
                  var geocoder;
-     
+
                 // Tile server
                 L.tileLayer(leafletTileServer, {
                    attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.gaslightmedia.com/">Gaslight Media</a>',
@@ -176,20 +177,20 @@
                    maxZoom: leafletMaxZoom,
                    id: 'nothot'
                 }).addTo(leafletMap);
-    
+
                 // Marker
                 var leafletMarker = L.marker([startLat, startLon], {
                     draggable: true
                 }).addTo(leafletMap);
-    
+
                 // Marker Drag/Drop action
                 leafletMarker.on('dragend', function(event){
                     var marker = event.target;
                     var position = marker.getLatLng();
-    
+
                     marker.setLatLng(new L.LatLng(position.lat, position.lng),{ draggable:'true' });
                     leafletMap.panTo(new L.LatLng(position.lat, position.lng))
-                        
+
                     // Assign it to the lat/lon fields for submission
                     $('#glmLat').val(position.lat.toFixed(6));
                     $('#glmLng').val(position.lng.toFixed(6));
@@ -238,15 +239,15 @@
                                 if( !data[0] || !data[0].lat || !data[0].lon ) {
                                     alert(addressMapFail);
                                 } else {
-                                    assignNewPosition(data);        
+                                    assignNewPosition(data);
                                     alert('We were unable to match all of your address data but did find this location.\n\n' + data[0].display_name + '\n\nPlease check that it is correct and adjust as needed by dragging the map pointer.\nYou may also want to check the city selected in the address.');
                                 }
                             });
                         } else {
-                                assignNewPosition(data);        
+                                assignNewPosition(data);
                         }
-                    });         
-                
+                    });
+
                 });
 
                 // Assign a position found by the Nominatim search above
@@ -276,8 +277,8 @@
 
     {/if}
 
-    {if $settings.selected_map_interface == 2}    
-            
+    {if $settings.selected_map_interface == 2}
+
             /*
              * Google Maps
              *  API reference: https://developers.google.com/maps/documentation/javascript/reference
@@ -404,7 +405,7 @@
                     }
                 });
             }
-            
+
 
     {/if}
 
@@ -412,7 +413,7 @@
             $(window).load(function(){
                 initMap();
               });
-            
+
 
         });
     </script>