Advertisement
Guest User

Untitled

a guest
Jan 11th, 2018
92
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.03 KB | None | 0 0
  1. diff -r 9bca98f059bf -r 406f33011a13 layouts/v7/modules/Consignment/resources/Edit.js
  2. --- a/layouts/v7/modules/Consignment/resources/Edit.js Wed Jan 10 18:04:15 2018 +0300
  3. +++ b/layouts/v7/modules/Consignment/resources/Edit.js Thu Jan 11 13:39:45 2018 +0300
  4. @@ -65,14 +65,26 @@
  5. params.parent_module = closestContainer.find('[name="popupReferenceModule"]').val();
  6. }
  7. }
  8. - AppConnector.request(params).then(
  9. - function(data){
  10. - aDeferred.resolve(data);
  11. +
  12. + //SalesPlatform.ru begin
  13. + //AppConnector.request(params).then(
  14. + // function(data){
  15. + // aDeferred.resolve(data);
  16. + // },
  17. + // function(error){
  18. + // aDeferred.reject();
  19. + // }
  20. + //)
  21. + app.request.get({data:params}).then(
  22. + function(err, res){
  23. + aDeferred.resolve(res);
  24. },
  25. function(error){
  26. + //TODO : Handle error
  27. aDeferred.reject();
  28. }
  29. - )
  30. + );
  31. + //SalesPlatform.ru end
  32. return aDeferred.promise();
  33. },
  34.  
  35. diff -r 9bca98f059bf -r 406f33011a13 layouts/v7/modules/Vtiger/resources/Vtiger.js
  36. --- a/layouts/v7/modules/Vtiger/resources/Vtiger.js Wed Jan 10 18:04:15 2018 +0300
  37. +++ b/layouts/v7/modules/Vtiger/resources/Vtiger.js Thu Jan 11 13:39:45 2018 +0300
  38. @@ -843,12 +843,7 @@
  39. */
  40. registerAutoCompleteFields : function(container) {
  41. var thisInstance = this;
  42. - //SalesPlatform.ru begin
  43. - //container.find('input.autoComplete').autocomplete({
  44. - $('body').on("keydown.autocomplete",".autoComplete",function(e){
  45. - $(this).autocomplete({
  46. - //SalesPlatform.ru end
  47. -
  48. + container.find('input.autoComplete').autocomplete({
  49. 'minLength' : '3',
  50. 'source' : function(request, response){
  51. //element will be array of dom elements
  52. @@ -930,10 +925,7 @@
  53. //trigger post reference selection
  54. sourceField.trigger(Vtiger_Edit_Js.postReferenceSelectionEvent,{'data':selectedItemData});
  55. },
  56. - //SalesPlatform.ru begin
  57. - });});
  58. - //});
  59. - //SalesPlatform.ru end
  60. + });
  61. },
  62.  
  63. /**
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement