Skip to content

Show tag tagset#4534

Merged
jburel merged 5 commits intoome:developfrom
will-moore:show_tag_tagset
Apr 26, 2016
Merged

Show tag tagset#4534
jburel merged 5 commits intoome:developfrom
will-moore:show_tag_tagset

Conversation

@will-moore
Copy link
Copy Markdown
Member

This fixes the links to "show" tag when tag is under a tagset or to show tagset.

To test:

  • Browse to Tag under a Tag set, copy link to it /webclient/?show=tag-801, paste to a different browser (not logged in), log in as a different user (who can access the tag) and check you are taken to the tag in tag tree.
  • Repeat with a Tag set. /webclient/?show=tagset-801
  • When combined with Show image.name fix #4540 this should also work for tags (in tagset or orphaned) webclient/usertags/?show=tag.textValue-Bod1
  • Also test with a Tag NOT under a Tag set.

@snoopycrimecop
Copy link
Copy Markdown
Member

Conflicting PR. Removed from build OMERO-DEV-merge-push#275. See the console output for more details.
Possible conflicts:

@jburel
Copy link
Copy Markdown
Member

jburel commented Mar 22, 2016

@will-moore: could you please add some tests?

@snoopycrimecop
Copy link
Copy Markdown
Member

Conflicting PR. Removed from build OMERO-DEV-merge-push#276. See the console output for more details.
Possible conflicts:

@will-moore
Copy link
Copy Markdown
Member Author

@chris-allan Just writing more Show() tests, I realise that none of the ?show=image.name etc will work with the new jsTree (5.2.x) since the jsTree uses paths_to_objects to get a json hierarchy for traversing to the selected object, but paths_to_objects only supports IDs, not any other attributes.

We now only use Show() class to get the owner and group that we need to switch to. We ignore the initially_select() and initially_open(), since the jstree looks up everything from scratch based on the url ?show=image-1 parameter.

To fix this, the paths_to_object code needs to handle attributes other than ID, making use of the Show() class.

@will-moore
Copy link
Copy Markdown
Member Author

@chris-allan @joshmoore @jburel. The legacy path parameter, E.g. webclient/?path=project-1|dataset-2|image-3 is also broken in 5.2.x.
We need to discuss our strategy for fixing all this: combining the Show() class functionality with paths_to_object.

@snoopycrimecop
Copy link
Copy Markdown
Member

Conflicting PR. Removed from build OMERO-DEV-merge-push#277. See the console output for more details.
Possible conflicts:

@will-moore will-moore mentioned this pull request Mar 24, 2016
@will-moore
Copy link
Copy Markdown
Member Author

@chris-allan Fix PR opened at #4540

@snoopycrimecop
Copy link
Copy Markdown
Member

Conflicting PR. Removed from build OMERO-DEV-merge-push#278. See the console output for more details.
Possible conflicts:

@will-moore will-moore mentioned this pull request Mar 25, 2016
@will-moore
Copy link
Copy Markdown
Member Author

Closing until #4511 is merged and can fix conflicts

@will-moore will-moore reopened this Apr 4, 2016
@will-moore will-moore closed this Apr 5, 2016
@will-moore will-moore reopened this Apr 5, 2016
@will-moore will-moore closed this Apr 5, 2016
@will-moore will-moore reopened this Apr 5, 2016
@pwalczysko
Copy link
Copy Markdown
Member

All works fine as prescribed in the header of the PR.
The only question is that
https://cowfish.op....y.org/merge/webclient/usertags/?show=tagset.textValue-ggg
works, which is surprising (not totally intended). From the user perspective, this is perfectly expected and logical behaviour though. @will-moore will have a look at this case, and when okay, this is fine by me as is the whole PR.

@will-moore
Copy link
Copy Markdown
Member Author

This is behaving as expected. Show.py class handles 'tagset' to produce:

show.initially_select = [u'tagset-23551']

And this is then handled by paths_to_tag to highlight tagset in tree.

So this is "good to merge" from me too.

@jburel jburel merged commit 4dbd05f into ome:develop Apr 26, 2016
@jburel jburel added this to the 5.2.3 milestone May 4, 2016
@sbesson sbesson modified the milestones: 5.3.0, 5.2.3 Sep 10, 2016
@sbesson sbesson modified the milestones: 5.2.3, 5.3.0 Sep 10, 2016
@will-moore will-moore deleted the show_tag_tagset branch February 18, 2019 04:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants