Просмотр исходного кода

Merge branch 'cherry-pick-fb4a6b96' into 'release'

Merge branch 'git/fix_minder_save_execption' into 'develop'

See merge request o2oa/o2oa!1731
蔡祥熠 5 лет назад
Родитель
Сommit
c0e5126c1b
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      o2web/source/x_component_MinderEditor/MainMenu.js

+ 3 - 1
o2web/source/x_component_MinderEditor/MainMenu.js

@@ -385,10 +385,12 @@ MWF.xApplication.MinderEditor.MainMenu = new Class({
             formData.append('file', img, title+".png");
             formData.append('site', id);
 
+            debugger;
+
             MWF.xDesktop.uploadImageByScale( id, "mindInfo", -1, formData, img,
                 function(json){
                     var url = o2.Actions.load("x_file_assemble_control").FileAction.action.actions.downloadStream.uri.replace( "{id}", json.data.id );
-                    url = o2.filterUrl( o2.Actions.load("x_file_assemble_control").FileAction.action.address + url);
+                    url = o2.filterUrl( o2.Actions.load("x_file_assemble_control").FileAction.action.getAddress() + url);
                     window.open(url);
                 }.bind(this)
             );