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

[DE] Fix Bug 41450

Browse source
This commit is contained in:
Julia Radzhabova 2019-04-26 17:10:34 +03:00
parent 7aa18ded9b
commit 42120fe5d4
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -109,6 +109,7 @@ define([
this.setApi(api); this.setApi(api);
if (data) { if (data) {
this.currentUserId = data.config.user.id;
this.sdkViewName = data['sdkviewname'] || this.sdkViewName; this.sdkViewName = data['sdkviewname'] || this.sdkViewName;
} }
}, },
@ -434,7 +435,8 @@ define([
changedata : item, changedata : item,
scope : me.view, scope : me.view,
hint : !me.appConfig.canReview, hint : !me.appConfig.canReview,
goto : (item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveTo || item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveFrom) goto : (item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveTo || item.get_MoveType() == Asc.c_oAscRevisionsMove.MoveFrom),
editable : (item.get_UserId() == me.currentUserId)
}); });
arr.push(change); arr.push(change);

2
apps/common/main/lib/model/ReviewChange.js
View file

@ -63,7 +63,7 @@ define([
type : 0, type : 0,
changedata : null, changedata : null,
hint : false, hint : false,
editable : false,
id : Common.UI.getId(), // internal id : Common.UI.getId(), // internal
scope : null scope : null
} }

4
apps/common/main/lib/template/ReviewChangesPopover.template
View file

@ -10,7 +10,9 @@
<% } %> <% } %>
<% if (!hint) { %> <% if (!hint) { %>
<% if (scope.appConfig.isReviewOnly) { %> <% if (scope.appConfig.isReviewOnly) { %>
<div class="btn-delete img-commonctrl"></div> <% if (editable) { %>
<div class="btn-delete img-commonctrl"></div>
<% } %>
<% } else { %> <% } else { %>
<div class="btn-accept img-commonctrl"></div> <div class="btn-accept img-commonctrl"></div>
<div class="btn-reject img-commonctrl"></div> <div class="btn-reject img-commonctrl"></div>