Skip to content

Use new annotation creation access flag #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eagw merged 2 commits into from
Aug 18, 2022
Merged

Use new annotation creation access flag #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b53ed2
Show create annot button w/access flag
eagw Aug 16, 2022
3476f99
Hide access flag in annotation access control
eagw Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion histomicsui/web_client/dialogs/saveAnnotation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ var SaveAnnotation = View.extend({
type: 'annotation',
hideRecurseOption: true,
parentView: this,
model: this.annotation
model: this.annotation,
noAccessFlag: true
}).on('g:accessListSaved', () => {
this.annotation.fetch();
});
Expand Down
10 changes: 7 additions & 3 deletions histomicsui/web_client/panels/AnnotationSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import _ from 'underscore';
import $ from 'jquery';

import { restRequest } from '@girder/core/rest';
import { AccessType } from '@girder/core/constants';
import eventStream from '@girder/core/utilities/EventStream';
import { getCurrentUser } from '@girder/core/auth';
Expand Down Expand Up @@ -68,8 +69,11 @@ var AnnotationSelector = Panel.extend({

render() {
this._debounceRenderRequest = null;
if (this.parentItem && this.parentItem.id) {
this.parentItem.getAccessLevel((imageAccessLevel) => {
if (this.parentItem && this.parentItem.get('folderId')) {
restRequest({
type: 'GET',
url: 'annotation/folder/' + this.parentItem.get('folderId') + '/create'
}).done((createResp) => {
const annotationGroups = this._getAnnotationGroups();
if (!this.viewer) {
this.$el.empty();
Expand All @@ -81,7 +85,7 @@ var AnnotationSelector = Panel.extend({
activeAnnotation: this._activeAnnotation ? this._activeAnnotation.id : '',
showLabels: this._showLabels,
user: getCurrentUser() || {},
accessLevel: imageAccessLevel,
creationAccess: createResp,
writeAccessLevel: AccessType.WRITE,
writeAccess: this._writeAccess,
opacity: this._opacity,
Expand Down
2 changes: 1 addition & 1 deletion histomicsui/web_client/templates/panels/annotationSelector.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ block content
label(title='Highlight annotations when hovering with the mouse.')
input#h-toggle-interactive(type='checkbox', checked=interactiveMode)
| Interactive
if accessLevel >= writeAccessLevel
if creationAccess
button.btn.btn-sm.btn-primary.h-create-annotation(title='Create a new annotation. Keyboard shortcut: space bar')
| #[span.icon-plus-squared] New
.clearfix