Mercurial > repos > gga > apollo_iframe

changeset 6:466f03bef714 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
planemo upload for repository https://github.com/galaxy-genome-annotation/galaxy-tools/tree/master/tools/apollo commit d9f27b297d9a919471c92b02ecf6cc9554457211
author gga
date Tue, 30 Oct 2018 04:30:22 -0400
parents 207c1c281360
children 9305e1881519
files __pycache__/webapollo.cpython-36.pyc json2iframe.xml webapollo.py webapollo.pyc
diffstat 4 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
Binary file __pycache__/webapollo.cpython-36.pyc has changed
--- a/json2iframe.xml	Fri Aug 31 09:33:49 2018 -0400
+++ b/json2iframe.xml	Tue Oct 30 04:30:22 2018 -0400
@@ -20,7 +20,7 @@
   <tests>
       <test>
           <param name="json_file" value="fake.json"/>
-          <output name="html">
+          <output name="output">
               <assert_contents>
                   <has_text text="Embedded Apollo Access" />
               </assert_contents>
--- a/webapollo.py	Fri Aug 31 09:33:49 2018 -0400
+++ b/webapollo.py	Tue Oct 30 04:30:22 2018 -0400
@@ -1544,10 +1544,7 @@
     permissionMap = {
         x['organism']: x['permissions']
         for x in user.organismPermissions
-        if 'WRITE' in x['permissions'] or
-        'READ' in x['permissions'] or
-        'ADMINISTRATE' in x['permissions'] or
-        user.role == 'ADMIN'
+        if 'WRITE' in x['permissions'] or 'READ' in x['permissions'] or 'ADMINISTRATE' in x['permissions'] or user.role == 'ADMIN'
     }
 
     if 'error' in orgs:
Binary file webapollo.pyc has changed