Skip to content

Allow non digits (rebased onto develop)#5018

Merged
jburel merged 3 commits intoome:developfrom
atarkowska:rebased/develop/allow_non_digits
Jan 13, 2017
Merged

Allow non digits (rebased onto develop)#5018
jburel merged 3 commits intoome:developfrom
atarkowska:rebased/develop/allow_non_digits

Conversation

@atarkowska
Copy link
Copy Markdown
Member

This is the same as gh-5014 but rebased onto develop.


What this PR does

This PR clean up console.logs and allow non digits to be passed as initially selected tree elements. see ome/omero-mapr#12

@atarkowska atarkowska mentioned this pull request Jan 6, 2017
@atarkowska
Copy link
Copy Markdown
Member Author

--rebased-from #5014

@snoopycrimecop
Copy link
Copy Markdown
Member

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

  • PR Spw grid view2 #4924 will-moore 'Spw grid view2'
    • components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/base/base_container.html

@snoopycrimecop
Copy link
Copy Markdown
Member

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

  • PR Spw grid view2 #4924 will-moore 'Spw grid view2'
    • components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/base/base_container.html

@atarkowska atarkowska mentioned this pull request Jan 6, 2017
1 task
# The nodes of the tree that will be initially open based on the
# nodes that are initially selected.
self._initially_open = None
self._initially_open = list()
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need to be careful how do we declare vars cc @will-moore

@joshmoore
Copy link
Copy Markdown
Member

joshmoore commented Jan 9, 2017

Travis status, e.g.

     [exec] _______________ TestShow.test_show_instantiation[show_request4] ________________
     [exec] 
     [exec] self = <test_show.TestShow object at 0x4bdf150>
     [exec] show_request = {'initially_select': (), 'request': <WSGIRequest: GET '/webclient?show=illegal-1'>}
     [exec] 
     [exec]     def test_show_instantiation(self, show_request):
     [exec]         show = Show(None, show_request['request'], None)
     [exec] >       assert show.initially_open is None
     [exec] E       assert [] is None
     [exec] E        +  where [] = <omeroweb.webclient.show.Show object at 0x4bdf390>.initially_open
     [exec] 
     [exec] test/unit/test_show.py:109: AssertionError
     [exec]  generated xml file: /home/travis/build/openmicroscopy/openmicroscopy/components/tools/OmeroWeb/target/reports/junit-results.xml 

@jburel jburel added the develop label Jan 9, 2017
@will-moore
Copy link
Copy Markdown
Member

Works fine, robot tests and "show" tests passing.

Good to merge.

@jburel jburel merged commit d527261 into ome:develop Jan 13, 2017
@atarkowska atarkowska deleted the rebased/develop/allow_non_digits branch January 13, 2017 13:37
@jburel jburel added this to the 5.3.0 milestone Mar 29, 2017
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