Merge pull request #1185 from AndreasK79/qso_edit_fix_in_live_qso
[QSO Edit] Fixes editing for county/sota/dok if you are editing QSO i…
这个提交包含在:
		
						当前提交
						50cd201573
					
				
					共有  2 个文件被更改,包括 15 次插入 和 15 次删除
				
			
		|  | @ -1257,27 +1257,27 @@ $(document).ready(function(){ | ||||||
|                         nl2br: false, |                         nl2br: false, | ||||||
|                         message: html, |                         message: html, | ||||||
|                         onshown: function(dialog) { |                         onshown: function(dialog) { | ||||||
|                             var state = $("#input_usa_state option:selected").text(); |                             var state = $("#input_usa_state_edit option:selected").text(); | ||||||
|                             if (state != "") { |                             if (state != "") { | ||||||
|                                 $("#stationCntyInput").prop('disabled', false); |                                 $("#stationCntyInputEdit").prop('disabled', false); | ||||||
|                                 selectize_usa_county(); |                                 selectize_usa_county(); | ||||||
|                             } |                             } | ||||||
| 
 | 
 | ||||||
|                             $('#input_usa_state').change(function(){ |                             $('#input_usa_state_edit').change(function(){ | ||||||
|                                 var state = $("#input_usa_state option:selected").text(); |                                 var state = $("#input_usa_state_edit option:selected").text(); | ||||||
|                                 if (state != "") { |                                 if (state != "") { | ||||||
|                                     $("#stationCntyInput").prop('disabled', false); |                                     $("#stationCntyInputEdit").prop('disabled', false); | ||||||
| 
 | 
 | ||||||
|                                     selectize_usa_county(); |                                     selectize_usa_county(); | ||||||
| 
 | 
 | ||||||
|                                 } else { |                                 } else { | ||||||
|                                     $("#stationCntyInput").prop('disabled', true); |                                     $("#stationCntyInputEdit").prop('disabled', true); | ||||||
|                                     //$('#stationCntyInput')[0].selectize.destroy();
 |                                     //$('#stationCntyInput')[0].selectize.destroy();
 | ||||||
|                                     $("#stationCntyInput").val(""); |                                     $("#stationCntyInputEdit").val(""); | ||||||
|                                 } |                                 } | ||||||
|                             }); |                             }); | ||||||
| 
 | 
 | ||||||
|                             $('#sota_ref').selectize({ |                             $('#sota_ref_edit').selectize({ | ||||||
|                                 maxItems: 1, |                                 maxItems: 1, | ||||||
|                                 closeAfterSelect: true, |                                 closeAfterSelect: true, | ||||||
|                                 loadThrottle: 250, |                                 loadThrottle: 250, | ||||||
|  | @ -1305,7 +1305,7 @@ $(document).ready(function(){ | ||||||
|                                 } |                                 } | ||||||
|                             }); |                             }); | ||||||
| 
 | 
 | ||||||
|                             $('#darc_dok').selectize({ |                             $('#darc_dok_edit').selectize({ | ||||||
|                                 maxItems: 1, |                                 maxItems: 1, | ||||||
|                                 closeAfterSelect: true, |                                 closeAfterSelect: true, | ||||||
|                                 loadThrottle: 250, |                                 loadThrottle: 250, | ||||||
|  | @ -1340,7 +1340,7 @@ $(document).ready(function(){ | ||||||
| 
 | 
 | ||||||
|         function selectize_usa_county() { |         function selectize_usa_county() { | ||||||
|             var baseURL= "<?php echo base_url();?>"; |             var baseURL= "<?php echo base_url();?>"; | ||||||
|             $('#stationCntyInput').selectize({ |             $('#stationCntyInputEdit').selectize({ | ||||||
| 				delimiter: ';', | 				delimiter: ';', | ||||||
|                 maxItems: 1, |                 maxItems: 1, | ||||||
|                 closeAfterSelect: true, |                 closeAfterSelect: true, | ||||||
|  | @ -1351,7 +1351,7 @@ $(document).ready(function(){ | ||||||
|                 options: [], |                 options: [], | ||||||
|                 create: false, |                 create: false, | ||||||
|                 load: function(query, callback) { |                 load: function(query, callback) { | ||||||
|                     var state = $("#input_usa_state option:selected").text(); |                     var state = $("#input_usa_state_edit option:selected").text(); | ||||||
| 
 | 
 | ||||||
|                     if (!query || state == "") return callback(); |                     if (!query || state == "") return callback(); | ||||||
|                     $.ajax({ |                     $.ajax({ | ||||||
|  |  | ||||||
|  | @ -305,7 +305,7 @@ | ||||||
| 
 | 
 | ||||||
|                                 <div class="form-group"> |                                 <div class="form-group"> | ||||||
|                                     <label for="usa_state">USA State</label> |                                     <label for="usa_state">USA State</label> | ||||||
|                                     <select class="custom-select" id="input_usa_state" name="usa_state"> |                                     <select class="custom-select" id="input_usa_state_edit" name="usa_state"> | ||||||
|                                         <option value=""></option> |                                         <option value=""></option> | ||||||
|                                         <option value="AL" <?php if($qso->COL_STATE == "AL") { echo "selected=\"selected\""; } ?>>Alabama (AL)</option>
 |                                         <option value="AL" <?php if($qso->COL_STATE == "AL") { echo "selected=\"selected\""; } ?>>Alabama (AL)</option>
 | ||||||
|                                         <option value="AK" <?php if($qso->COL_STATE == "AK") { echo "selected=\"selected\""; } ?>>Alaska (AK)</option>
 |                                         <option value="AK" <?php if($qso->COL_STATE == "AK") { echo "selected=\"selected\""; } ?>>Alaska (AK)</option>
 | ||||||
|  | @ -363,7 +363,7 @@ | ||||||
| 
 | 
 | ||||||
|                                 <div class="form-group"> |                                 <div class="form-group"> | ||||||
|                                     <label for="stationCntyInput">USA County</label> |                                     <label for="stationCntyInput">USA County</label> | ||||||
|                                     <input disabled="disabled" class="form-control" id="stationCntyInput" type="text" name="usa_county" value="<?php echo $qso->COL_CNTY; ?>" /> |                                     <input disabled="disabled" class="form-control" id="stationCntyInputEdit" type="text" name="usa_county" value="<?php echo $qso->COL_CNTY; ?>" /> | ||||||
|                                 </div> |                                 </div> | ||||||
| 
 | 
 | ||||||
|                                 <div class="form-group"> |                                 <div class="form-group"> | ||||||
|  | @ -386,7 +386,7 @@ | ||||||
| 
 | 
 | ||||||
|                                 <div class="form-group"> |                                 <div class="form-group"> | ||||||
|                                     <label for="sota_ref">SOTA</label> |                                     <label for="sota_ref">SOTA</label> | ||||||
|                                     <input type="text" class="form-control" id="sota_ref" name="sota_ref" value="<?php echo $qso->COL_SOTA_REF; ?>"> |                                     <input type="text" class="form-control" id="sota_ref_edit" name="sota_ref" value="<?php echo $qso->COL_SOTA_REF; ?>"> | ||||||
|                                 </div> |                                 </div> | ||||||
| 
 | 
 | ||||||
|                                 <div class="form-group"> |                                 <div class="form-group"> | ||||||
|  | @ -401,7 +401,7 @@ | ||||||
| 
 | 
 | ||||||
|                                 <div class="form-group"> |                                 <div class="form-group"> | ||||||
|                                     <label for="darc_dok">DOK</label> |                                     <label for="darc_dok">DOK</label> | ||||||
|                                     <input type="text" class="form-control" id="darc_dok" name="darc_dok" value="<?php echo $qso->COL_DARC_DOK; ?>"> |                                     <input type="text" class="form-control" id="darc_dok_edit" name="darc_dok" value="<?php echo $qso->COL_DARC_DOK; ?>"> | ||||||
|                                 </div> |                                 </div> | ||||||
|                             </div> |                             </div> | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用