Projekt

Allgemein

Profil

Herunterladen (2,56 KB)

GX-Bug #44653 » EditAndDeleteProductAttributesInOrderDetailFix.patch

Fix als Patch, falls der Cherry-Pick nicht funktionieren sollte. - Ronald Loyko, 20.01.2016 17:56

Unterschiede anzeigen:

src/admin/javascript/engine/compatibility/orders/orders_edit_controller.js (revision f2dcb79d1871c74f311a3ec1fabe7a36a62bf83c)
65 65 
		/**
66 66 
		 * Map trash icon to submit button
67 67 
		 */
68 
		$('.btn-delete').on('click', function () {
69 
			$('form[name="product_option_delete"]').submit();
68 
		$('[data-new-delete-button]').on('click', function () {
69 
			$(this)
70 
				.closest('form[name="product_option_delete"]')
71 
				.submit();
70 72 
		});
71 73 

  		




  72
  74
  
    
		/**


  		




  ......




  82
  84
  
    
		/**


  		




  83
  85
  
    
		 * Map the new save button to the old one on click


  		




  84
  86
  
    
		 */


  		




  85
  
  
    
		$('[name="save"]').on('click', function (e) {


  		




  
  87
  
    
		$('[data-new-save-button]').on('click', function (e) {


  		




  86
  88
  
    
			e.preventDefault();


  		




  87
  
  
    
			$('[name="save_original"]').click();


  		




  
  89
  
    

  		




  
  90
  
    
			$(this)


  		




  
  91
  
    
				.closest('tr')


  		




  
  92
  
    
				.find('[name="save_original"]')


  		




  
  93
  
    
				.click();


  		




  88
  94
  
    
		});


  		




  89
  95
  
    

  		




  90
  96
  
    
		// ------------------------------------------------------------------------


  		












  

    
      src/admin/orders_edit_options.php	(revision f2dcb79d1871c74f311a3ec1fabe7a36a62bf83c)
    
  





  90
  90
  
    
					echo '<input type="submit" class="button pull-right" onClick="this.blur();" value="' . BUTTON_DELETE . '"/>';


  		




  91
  91
  
    
					?>


  		




  92
  92
  
    
					<div class="action-list pull-right" data-gx-extension="toolbar_icons">


  		




  93
  
  
    
						<a class="btn-delete" href="#"></a>


  		




  
  93
  
    
						<a class="btn-delete" href="#" data-new-delete-button></a>


  		




  94
  94
  
    
					</div>


  		




  95
  95
  
    
					<div class="control-group display-inline" data-gx-widget="checkbox">


  		




  96
  96
  
    
						<input type="checkbox" name="update_stock" value="1" class="update_stock" data-single_checkbox/>


  		




  97
  97
  
    
					</div>


  		




  98
  98
  
    
					<td class="dataTableContent save-button">


  		




  99
  
  
    
						<?php


  		




  100
  
  
    
						echo '<input type="submit" name="save" class="button pull-right" onClick="this.blur();" value="' . BUTTON_SAVE . '"/>';


  		




  101
  
  
    
						?>


  		




  
  99
  
    
						<?php echo '<input type="submit" data-new-save-button name="save" class="button pull-right" onClick="this.blur();" value="' . BUTTON_SAVE . '"/>'; ?>


  		




  102
  100
  
    
					</td>


  		




  103
  101
  
    
				</form>


  		




  104
  102
  
    
			</td>


  		















  
    (1-1/1)