Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix Bug 41097

Browse source
This commit is contained in:
Julia Radzhabova 2019-04-08 18:40:08 +03:00
parent f89a8674b0
commit 3adde58fde
7 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/common/main/lib/view/Header.js
View file

@ -54,6 +54,7 @@ define([
var storeUsers, appConfig;
var $userList, $panelUsers, $btnUsers;
var $saveStatus;
var _readonlyRights = false;
var templateUserItem =
'<li id="<%= user.get("iid") %>" class="<% if (!user.get("online")) { %> offline <% } if (user.get("view")) {%> viewmode <% } %>">' +
@ -165,7 +166,7 @@ define([
.removeClass('dropdown-toggle')
.menu = false;
$panelUsers[(appConfig && !appConfig.isReviewOnly && appConfig.sharingSettingsUrl && appConfig.sharingSettingsUrl.length) ? 'show' : 'hide']();
$panelUsers[(!_readonlyRights && appConfig && !appConfig.isReviewOnly && appConfig.sharingSettingsUrl && appConfig.sharingSettingsUrl.length) ? 'show' : 'hide']();
}
$btnUsers.find('.caption')
@ -180,6 +181,12 @@ define([
}
}
function onLostEditRights() {
_readonlyRights = true;
$panelUsers.find('#tlb-change-rights').hide();
$btnUsers && !$btnUsers.menu && $panelUsers.hide();
}
function onUsersClick(e) {
if ( !$btnUsers.menu ) {
$panelUsers.removeClass('open');
@ -390,6 +397,7 @@ define([
Common.NotificationCenter.on('app:face', function(mode) {
Common.Utils.asyncCall(onAppShowed, me, mode);
});
Common.NotificationCenter.on('collaboration:sharingdeny', onLostEditRights);
},
render: function (el, role) {

3
apps/documenteditor/main/app/controller/Main.js
View file

@ -408,7 +408,7 @@ define([
old_rights = this._state.lostEditingRights;
this._state.lostEditingRights = !this._state.lostEditingRights;
this.api.asc_coAuthoringDisconnect();
this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights();
Common.NotificationCenter.trigger('collaboration:sharingdeny');
Common.NotificationCenter.trigger('api:disconnect');
if (!old_rights)
Common.UI.warning({
@ -1407,6 +1407,7 @@ define([
}
this._state.lostEditingRights = true;
config.msg = this.errorUserDrop;
Common.NotificationCenter.trigger('collaboration:sharingdeny');
break;
case Asc.c_oAscError.ID.MailMergeLoadFile:

1
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -945,6 +945,7 @@ define([
}
Common.NotificationCenter.on('collaboration:sharing', _.bind(this.changeAccessRights, this));
Common.NotificationCenter.on('collaboration:sharingdeny', _.bind(this.onLostEditRights, this));
return this;
},

3
apps/presentationeditor/main/app/controller/Main.js
View file

@ -381,7 +381,7 @@ define([
old_rights = this._state.lostEditingRights;
this._state.lostEditingRights = !this._state.lostEditingRights;
this.api.asc_coAuthoringDisconnect();
this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights();
Common.NotificationCenter.trigger('collaboration:sharingdeny');
Common.NotificationCenter.trigger('api:disconnect');
if (!old_rights)
Common.UI.warning({
@ -1140,6 +1140,7 @@ define([
}
this._state.lostEditingRights = true;
config.msg = this.errorUserDrop;
Common.NotificationCenter.trigger('collaboration:sharingdeny');
break;
case Asc.c_oAscError.ID.Warning:

1
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -762,6 +762,7 @@ define([
}
Common.NotificationCenter.on('collaboration:sharing', _.bind(this.changeAccessRights, this));
Common.NotificationCenter.on('collaboration:sharingdeny', _.bind(this.onLostEditRights, this));
return this;
},

3
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -404,7 +404,7 @@ define([
old_rights = this._state.lostEditingRights;
this._state.lostEditingRights = !this._state.lostEditingRights;
this.api.asc_coAuthoringDisconnect();
this.getApplication().getController('LeftMenu').leftMenu.getMenu('file').panels['rights'].onLostEditRights();
Common.NotificationCenter.trigger('collaboration:sharingdeny');
Common.NotificationCenter.trigger('api:disconnect');
if (!old_rights)
Common.UI.warning({
@ -1276,6 +1276,7 @@ define([
}
this._state.lostEditingRights = true;
config.msg = this.errorUserDrop;
Common.NotificationCenter.trigger('collaboration:sharingdeny');
break;
case Asc.c_oAscError.ID.InvalidReferenceOrName:

1
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -1217,6 +1217,7 @@ define([
}
Common.NotificationCenter.on('collaboration:sharing', _.bind(this.changeAccessRights, this));
Common.NotificationCenter.on('collaboration:sharingdeny', _.bind(this.onLostEditRights, this));
return this;
},