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

Fix review changes locking

Browse source
This commit is contained in:
Julia Radzhabova 2019-03-25 17:21:27 +03:00
parent a6b5989099
commit 0c20f3b91e
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -418,7 +418,7 @@ define([
changetext : changetext, changetext : changetext,
id : Common.UI.getId(), id : Common.UI.getId(),
lock : (item.get_LockUserId()!==null), lock : (item.get_LockUserId()!==null),
lockuser : item.get_LockUserId(), lockuser : me.getUserName(item.get_LockUserId()),
type : item.get_Type(), type : item.get_Type(),
changedata : item, changedata : item,
scope : me.view, scope : me.view,

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

@ -14,4 +14,8 @@
<% } %> <% } %>
</div> </div>
<% } %> <% } %>
<% if (lock) { %>
<div class="lock-area" style="cursor: default;"></div>
<div class="lock-author" style="cursor: default;"><%=lockuser%></div>
<% } %>
</div> </div>

8
apps/common/main/lib/view/ReviewPopover.js
View file

@ -480,9 +480,7 @@ define([
handleSelect: false, handleSelect: false,
scrollable: true, scrollable: true,
template: _.template('<div class="dataview-ct inner" style="overflow-y: visible;">'+ template: _.template('<div class="dataview-ct inner" style="overflow-y: visible;">'+
'</div>' + '</div>'
'<div class="lock-area" style="cursor: default;"></div>' +
'<div class="lock-author" style="cursor: default;"></div>'
) )
} }
} }
@ -544,8 +542,8 @@ define([
showReview: function (animate, lock, lockuser) { showReview: function (animate, lock, lockuser) {
this.show(animate); this.show(animate);
this.reviewChangesView.cmpEl.find('.lock-area').toggleClass('hidden', !lock); // this.reviewChangesView.cmpEl.find('.lock-area').toggleClass('hidden', !lock);
this.reviewChangesView.cmpEl.find('.lock-author').toggleClass('hidden', !lock || _.isEmpty(lockuser)).text(lockuser); // this.reviewChangesView.cmpEl.find('.lock-author').toggleClass('hidden', !lock || _.isEmpty(lockuser)).text(lockuser);
this._state.reviewVisible = true; this._state.reviewVisible = true;
}, },