pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix plugins update from plugins manager

Browse Source
This commit is contained in:
Julia Radzhabova
2023-09-29 16:54:55 +03:00
parent d5941270af
commit 7aeb13e434
2 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/common/main/lib/controller/Plugins.js
View File

@ -488,7 +488,7 @@ define([
onPluginsInit: function(pluginsdata) {
!(pluginsdata instanceof Array) && (pluginsdata = pluginsdata["pluginsData"]);
this.parsePlugins(pluginsdata)
this.parsePlugins(pluginsdata, false, true)
},
onPluginShowButton: function(id, toRight) {
@ -526,7 +526,7 @@ define([
});
},
parsePlugins: function(pluginsdata, uiCustomize) {
parsePlugins: function(pluginsdata, uiCustomize, forceUpdate) {
var me = this;
var pluginStore = this.getApplication().getCollection('Common.Collections.Plugins'),
isEdit = me.appOptions.isEdit && !me.isPDFEditor,
@ -536,12 +536,20 @@ define([
var arr = [], arrUI = [],
lang = me.appOptions.lang.split(/[\-_]/)[0];
pluginsdata.forEach(function(item){
if ( arr.some(function(i) {
return (i.get('baseUrl') == item.baseUrl || i.get('guid') == item.guid);
}
) || pluginStore.findWhere({baseUrl: item.baseUrl}) || pluginStore.findWhere({guid: item.guid}))
{
return;
var updatedItem;
if (forceUpdate) {
updatedItem = arr.find(function (i){
return i.get('baseUrl') == item.baseUrl || i.get('guid') == item.guid}
);
!updatedItem && (updatedItem = pluginStore.findWhere({baseUrl: item.baseUrl}));
!updatedItem && (updatedItem = pluginStore.findWhere({guid: item.guid}));
} else {
if ( arr.some(function(i) {
return (i.get('baseUrl') == item.baseUrl || i.get('guid') == item.guid);
}) || pluginStore.findWhere({baseUrl: item.baseUrl}) || pluginStore.findWhere({guid: item.guid}) )
{
return;
}
}
var variationsArr = [],
@ -592,7 +600,7 @@ define([
if (pluginVisible)
pluginVisible = me.checkPluginVersion(apiVersion, item.minVersion);
arr.push(new Common.Models.Plugin({
var props = {
name : name,
guid: item.guid,
baseUrl : item.baseUrl,
@ -604,7 +612,8 @@ define([
minVersion: item.minVersion,
original: item,
isDisplayedInViewer: isDisplayedInViewer
}));
};
updatedItem ? updatedItem.set(props) : arr.push(new Common.Models.Plugin(props));
}
});