November 2009 - galaxy-dev - lists.galaxyproject.org

[hg] galaxy 2989: Grid bug fix.
by Nate Coraor 09 Nov '09

09 Nov '09

details: http://www.bx.psu.edu/hg/galaxy/rev/1612a5f4ed62 changeset: 2989:1612a5f4ed62 user: jeremy goecks <jeremy.goecks(a)emory.edu> date: Mon Nov 09 15:50:12 2009 -0500 description: Grid bug fix. diffstat: lib/galaxy/web/framework/helpers/grids.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 62adea4325d7 -r 1612a5f4ed62 lib/galaxy/web/framework/helpers/grids.py --- a/lib/galaxy/web/framework/helpers/grids.py Mon Nov 09 15:33:38 2009 -0500 +++ b/lib/galaxy/web/framework/helpers/grids.py Mon Nov 09 15:50:12 2009 -0500 @@ -21,7 +21,7 @@ columns = [] operations = [] standard_filters = [] - default_filter = None + default_filter = {} default_sort_key = None preserve_state = False

1 0

[hg] galaxy 2984: enable history renaming functionality to handl...
by Nate Coraor 09 Nov '09

09 Nov '09

details: http://www.bx.psu.edu/hg/galaxy/rev/736b4ebcd9db changeset: 2984:736b4ebcd9db user: jeremy goecks <jeremy.goecks(a)emory.edu> date: Mon Nov 09 12:21:32 2009 -0500 description: enable history renaming functionality to handle unicode strings. diffstat: lib/galaxy/web/controllers/history.py | 6 +++--- templates/history/rename.mako | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diffs (46 lines): diff -r 144abb3b14bc -r 736b4ebcd9db lib/galaxy/web/controllers/history.py --- a/lib/galaxy/web/controllers/history.py Sat Nov 07 10:30:20 2009 -0500 +++ b/lib/galaxy/web/controllers/history.py Mon Nov 09 12:21:32 2009 -0500 @@ -106,7 +106,7 @@ grids.MulticolFilterColumn( "Search", cols_to_filter=[ columns[0], columns[2] ], - key="free-text-search", visible=False, filterable="default" ) + key="free-text-search", visible=False, filterable="standard" ) ) operations = [ @@ -807,13 +807,13 @@ history = get_history( trans, history_id ) if history and history.user_id == user.id: histories.append( history ) - cur_names.append( history.name ) + cur_names.append( history.get_display_name() ) if not name or len( histories ) != len( name ): return trans.fill_template( "/history/rename.mako", histories=histories ) change_msg = "" for i in range(len(histories)): if histories[i].user_id == user.id: - if name[i] == histories[i].name: + if name[i] == histories[i].get_display_name(): change_msg = change_msg + "<p>History: "+cur_names[i]+" is already named: "+name[i]+"</p>" elif name[i] not in [None,'',' ']: name[i] = escape(name[i]) diff -r 144abb3b14bc -r 736b4ebcd9db templates/history/rename.mako --- a/templates/history/rename.mako Sat Nov 07 10:30:20 2009 -0500 +++ b/templates/history/rename.mako Mon Nov 09 12:21:32 2009 -0500 @@ -18,11 +18,11 @@ %for history in histories: <tr> <td> - <input type="hidden" name="id" value="${trans.security.encode_id( history.id )}"> - ${history.name} + <input type="hidden" name="id" value="${trans.security.encode_id( history.id )}"> + ${history.get_display_name()} </td> <td> - <input type="text" name="name" value="${history.name}" size="40"> + <input type="text" name="name" value="${history.get_display_name()}" size="40"> </td> </tr> %endfor

1 0

[hg] galaxy 2985: Refactoring and bug fixes for grid templates.
by Nate Coraor 09 Nov '09

09 Nov '09

details: http://www.bx.psu.edu/hg/galaxy/rev/cc3e5d4538db changeset: 2985:cc3e5d4538db user: jeremy goecks <jeremy.goecks(a)emory.edu> date: Mon Nov 09 14:07:16 2009 -0500 description: Refactoring and bug fixes for grid templates. diffstat: lib/galaxy/web/controllers/dataset.py | 2 +- lib/galaxy/web/framework/helpers/grids.py | 6 +- templates/dataset/grid.mako | 299 +----------------------------- templates/grid_base.mako | 358 +++++++++++++++++++++++++++++++++++ templates/grid_common.mako | 95 ++++----- templates/history/grid.mako | 312 +------------------------------- 6 files changed, 409 insertions(+), 663 deletions(-) diffs (1126 lines): diff -r 736b4ebcd9db -r cc3e5d4538db lib/galaxy/web/controllers/dataset.py --- a/lib/galaxy/web/controllers/dataset.py Mon Nov 09 12:21:32 2009 -0500 +++ b/lib/galaxy/web/controllers/dataset.py Mon Nov 09 14:07:16 2009 -0500 @@ -83,7 +83,7 @@ grids.MulticolFilterColumn( "Search", cols_to_filter=[ columns[0], columns[2] ], - key="free-text-search", visible=False, filterable="default" ) + key="free-text-search", visible=False, filterable="standard" ) ) operations = [] standard_filters = [] diff -r 736b4ebcd9db -r cc3e5d4538db lib/galaxy/web/framework/helpers/grids.py --- a/lib/galaxy/web/framework/helpers/grids.py Mon Nov 09 12:21:32 2009 -0500 +++ b/lib/galaxy/web/framework/helpers/grids.py Mon Nov 09 14:07:16 2009 -0500 @@ -16,7 +16,7 @@ title = "" exposed = True model_class = None - template = "grid.mako" + template = "grid_base.mako" global_actions = [] columns = [] operations = [] @@ -99,9 +99,9 @@ if isinstance( decoded_item, list): decoded_list = from_json_string_recurse( decoded_item ) else: - decoded_list = [ str( decoded_item ) ] + decoded_list = [ unicode( decoded_item ) ] except ValueError: - decoded_list = [ str( item ) ] + decoded_list = [ unicode ( item ) ] elif isinstance( item, list): return_val = [] for element in item: diff -r 736b4ebcd9db -r cc3e5d4538db templates/dataset/grid.mako --- a/templates/dataset/grid.mako Mon Nov 09 12:21:32 2009 -0500 +++ b/templates/dataset/grid.mako Mon Nov 09 14:07:16 2009 -0500 @@ -1,298 +1,1 @@ -<%! from galaxy.web.framework.helpers.grids import GridColumnFilter %> - -<%inherit file="/base.mako"/> -<%def name="title()">${grid.title}</%def> - -%if message: - <p> - <div class="${message_type}message transient-message">${message}</div> - <div style="clear: both"></div> - </p> -%endif - -<%def name="javascripts()"> - ${parent.javascripts()} - ${h.js("jquery.autocomplete", "autocomplete_tagging" )} - <script type="text/javascript"> - ## TODO: generalize and move into galaxy.base.js - $(document).ready(function() { - $(".grid").each( function() { - var grid = this; - var checkboxes = $(this).find("input.grid-row-select-checkbox"); - var update = $(this).find( "span.grid-selected-count" ); - $(checkboxes).each( function() { - $(this).change( function() { - var n = $(checkboxes).filter("[checked]").size(); - update.text( n ); - }); - }) - }); - - // Set up autocomplete for tag filter input. - var t = $("#input-tag-filter"); - t.keyup( function( e ) - { - if ( e.keyCode == 27 ) - { - // Escape key - $(this).trigger( "blur" ); - } else if ( - ( e.keyCode == 13 ) || // Return Key - ( e.keyCode == 188 ) || // Comma - ( e.keyCode == 32 ) // Space - ) - { - // - // Check input. - // - - new_value = this.value; - - // Do nothing if return key was used to autocomplete. - if (return_key_pressed_for_autocomplete == true) - { - return_key_pressed_for_autocomplete = false; - return false; - } - - // Suppress space after a ":" - if ( new_value.indexOf(": ", new_value.length - 2) != -1) - { - this.value = new_value.substring(0, new_value.length-1); - return false; - } - - // Remove trigger keys from input. - if ( (e.keyCode == 188) || (e.keyCode == 32) ) - new_value = new_value.substring( 0 , new_value.length - 1 ); - - // Trim whitespace. - new_value = new_value.replace(/^\s+|\s+$/g,""); - - // Too short? - if (new_value.length < 3) - return false; - - // - // New tag OK. - // - } - }); - - // Add autocomplete to input. - var format_item_func = function(key, row_position, num_rows, value, search_term) - { - tag_name_and_value = value.split(":"); - return (tag_name_and_value.length == 1 ? tag_name_and_value[0] :tag_name_and_value[1]); - //var array = new Array(key, value, row_position, num_rows, - //search_term ); return "\"" + array.join("*") + "\""; - } - var autocomplete_options = - { selectFirst: false, formatItem : format_item_func, autoFill: false, highlight: false, mustMatch: true }; - - t.autocomplete("${h.url_for( controller='tag', action='tag_autocomplete_data', item_class='HistoryDatasetAssociation' )}", autocomplete_options); - - return t; - }); - ## Can this be moved into base.mako? - %if refresh_frames: - %if 'masthead' in refresh_frames: - ## Refresh masthead == user changes (backward compatibility) - if ( parent.user_changed ) { - %if trans.user: - parent.user_changed( "${trans.user.email}", ${int( app.config.is_admin_user( trans.user ) )} ); - %else: - parent.user_changed( null, false ); - %endif - } - %endif - %if 'history' in refresh_frames: - if ( parent.frames && parent.frames.galaxy_history ) { - ## If available, include HDA ids to seek to in history request. - <% - hda_id = None - if seek_hda_ids: - hda_id = str( seek_hda_ids[0] ) # Use only the first id. - print hda_id - %> - parent.frames.galaxy_history.location.href="${h.url_for( controller='root', action='history', hda_id=hda_id )}"; - if ( parent.force_right_panel ) { - parent.force_right_panel( 'show' ); - } - } - %endif - %if 'tools' in refresh_frames: - if ( parent.frames && parent.frames.galaxy_tools ) { - parent.frames.galaxy_tools.location.href="${h.url_for( controller='root', action='tool_menu')}"; - if ( parent.force_left_panel ) { - parent.force_left_panel( 'show' ); - } - } - %endif - %endif - - // - // Add a tag to the current grid filter; this adds the tag to the filter and then issues a request to refresh the grid. - // - function add_tag_to_grid_filter(tag_name, tag_value) - { - // Use tag as a filter: replace TAGNAME with tag_name and issue query. - <% - url_args = {} - if "tags" in cur_filter_dict and cur_filter_dict["tags"] != "All": - url_args["f-tags"] = cur_filter_dict["tags"].encode("utf-8") + ", TAGNAME" - else: - url_args["f-tags"] = "TAGNAME" - %> - var url_base = "${url( url_args )}"; - var url = url_base.replace("TAGNAME", tag_name); - self.location = url; - } - - </script> -</%def> - -<%def name="stylesheets()"> - ${h.css( "base", "autocomplete_tagging" )} - <style> - ## Not generic to all grids -- move to base? - .count-box { - min-width: 1.1em; - padding: 5px; - border-width: 1px; - border-style: solid; - text-align: center; - display: inline-block; - } - </style> -</%def> - -<%namespace file="../grid_common.mako" import="*" /> - -## Print grid header. -${render_grid_filters()} - -## Print grid. -<form name="dataset_actions" action="${url()}" method="post" > - <table class="grid"> - <thead> - <tr> - %for column in grid.columns: - %if column.visible: - <% - href = "" - extra = "" - if column.sortable: - if sort_key == column.key: - if sort_order == "asc": - href = url( sort=( "-" + column.key ) ) - extra = "↓" - else: - href = url( sort=( column.key ) ) - extra = "↑" - else: - href = url( sort=column.key ) - %> - <th\ - %if column.ncells > 1: - colspan="${column.ncells}" - %endif - > - %if href: - <a href="${href}">${column.label}</a> - %else: - ${column.label} - %endif - <span>${extra}</span> - </th> - %endif - %endfor - <th></th> - </tr> - </thead> - <tbody> - %for i, item in enumerate( query ): - <tr \ - %if current_item == item: - class="current" \ - %endif - > - ## Data columns - %for column in grid.columns: - %if column.visible: - <% - # Link - link = column.get_link( trans, grid, item ) - if link: - href = url( **link ) - else: - href = None - # Value (coerced to list so we can loop) - value = column.get_value( trans, grid, item ) - if column.ncells == 1: - value = [ value ] - %> - %for cellnum, v in enumerate( value ): - <% - if isinstance(v, str): - v = unicode(v, 'utf-8') - # Attach popup menu? - if column.attach_popup and cellnum == 0: - extra = '<a id="grid-%d-popup" class="arrow" style="display: none;"><span>▼</span></a>' % i - else: - extra = "" - %> - %if href: - <td><div class="menubutton split" style="float: left;"><a class="label" href="${href}">${v}${extra}</a> </td> - %else: - <td >${v}${extra}</td> - %endif - %endfor - %endif - %endfor - ## Actions column - <td> - <div popupmenu="grid-${i}-popup"> - %for operation in grid.operations: - %if operation.allowed( item ): - <a class="action-button" href="${url( operation=operation.label, id=item.id )}">${operation.label}</a> - %endif - %endfor - </div> - </td> - </tr> - %endfor - </tbody> - <tfoot> - %if num_pages > 1: - <tr> - <td></td> - <td colspan="100" style="text-align: right"> - Page: - %for page_index in range(1, num_pages + 1): - %if page_index == cur_page_num: - <span style="font-style: italic">${page_index}</span> - %else: - <% args = { "page" : page_index } %> - <span><a href="${url( args )}">${page_index}</a></span> - %endif - %endfor - </td> - </tr> - %endif - %if grid.operations: - <tr> - <td></td> - <td colspan="100"> - For <span class="grid-selected-count"></span> selected histories: - %for operation in grid.operations: - %if operation.allow_multiple: - <input type="submit" name="operation" value="${operation.label}" class="action-button"> - %endif - %endfor - </td> - </tr> - %endif - </tfoot> - </table> -</form> +<%inherit file="/grid_base.mako"/> \ No newline at end of file diff -r 736b4ebcd9db -r cc3e5d4538db templates/grid_base.mako --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/templates/grid_base.mako Mon Nov 09 14:07:16 2009 -0500 @@ -0,0 +1,358 @@ +<%! + from galaxy.model import History, HistoryDatasetAssociation + def inherit(context): + if context.get('use_panels'): + return '/base_panels.mako' + else: + return '/base.mako' +%> +<%inherit file="${inherit(context)}"/> + +## Render the grid's basic elements. Each of these elements can be subclassed. +%if message: + <p> + <div class="${message_type}message transient-message">${message}</div> + <div style="clear: both"></div> + </p> +%endif + +${self.grid_header()} +${self.grid_table()} + +## Function definitions. + +<%def name="title()">${grid.title}</%def> + +<%def name="javascripts()"> + ${parent.javascripts()} + ${h.js("jquery.autocomplete", "autocomplete_tagging" )} + <script type="text/javascript"> + ## TODO: generalize and move into galaxy.base.js + $(document).ready(function() { + // Initialize grid elements. + $(".grid").each( function() { + var grid = this; + var checkboxes = $(this).find("input.grid-row-select-checkbox"); + var update = $(this).find( "span.grid-selected-count" ); + $(checkboxes).each( function() { + $(this).change( function() { + var n = $(checkboxes).filter("[checked]").size(); + update.text( n ); + }); + }) + }); + + // Initialize autocomplete for text inputs in search UI. + var t = $("#input-tags-filter"); + if (t.length) + { + + var autocomplete_options = + { selectFirst: false, autoFill: false, highlight: false, mustMatch: false }; + + t.autocomplete("${h.url_for( controller='tag', action='tag_autocomplete_data', item_class='History' )}", autocomplete_options); + } + + var t2 = $("#input-name-filter"); + if (t2.length) + { + var autocomplete_options = + { selectFirst: false, autoFill: false, highlight: false, mustMatch: false }; + + t2.autocomplete("${h.url_for( controller='history', action='name_autocomplete_data' )}", autocomplete_options); + } + }); + ## Can this be moved into base.mako? + %if refresh_frames: + %if 'masthead' in refresh_frames: + ## Refresh masthead == user changes (backward compatibility) + if ( parent.user_changed ) { + %if trans.user: + parent.user_changed( "${trans.user.email}", ${int( app.config.is_admin_user( trans.user ) )} ); + %else: + parent.user_changed( null, false ); + %endif + } + %endif + %if 'history' in refresh_frames: + if ( parent.frames && parent.frames.galaxy_history ) { + parent.frames.galaxy_history.location.href="${h.url_for( controller='root', action='history')}"; + if ( parent.force_right_panel ) { + parent.force_right_panel( 'show' ); + } + } + %endif + %if 'tools' in refresh_frames: + if ( parent.frames && parent.frames.galaxy_tools ) { + parent.frames.galaxy_tools.location.href="${h.url_for( controller='root', action='tool_menu')}"; + if ( parent.force_left_panel ) { + parent.force_left_panel( 'show' ); + } + } + %endif + %endif + + // Filter and sort args for grid. + var filter_args = ${h.to_json_string(cur_filter_dict)}; + var sort_key = "${sort_key}"; + + // + // Add tag to grid filter. + // + function add_tag_to_grid_filter(tag_name, tag_value) + { + // Put tag name and value together. + var tag = tag_name + (tag_value != null && tag_value != "" ? ":" + tag_value : ""); + add_condition_to_grid_filter("tags", tag, true); + } + + // + // Add a filter to the current grid filter; this adds the filter and then issues a request to refresh the grid. + // + function add_condition_to_grid_filter(name, value, append) + { + // Update filter arg with new condition. + if (append) + { + // Append value. + var cur_val = filter_args[name]; + if (cur_val != "All") + cur_val = cur_val + ", " + value; + else + cur_val = value; + filter_args[name] = cur_val; + } + else + { + // Replace value. + filter_args[name] = value; + } + + // Build URL with filter args, sort key. + var filter_arg_value_strs = new Array(); + var i = 0; + for (arg in filter_args) + { + filter_arg_value_strs[i++] = "f-" + arg + "=" + filter_args[arg]; + } + var filter_str = filter_arg_value_strs.join("&"); + var url_base = "${h.url_for( action='list')}"; + var url = url_base + "?" + filter_str + "&sort=" + sort_key; + self.location = url; + } + + // + // Initiate navigation when user selects a page to view. + // + function navigate_to_page(page_select) + { + page_num = $(page_select).val(); + <% url_args = {"page" : "PAGE"} %> + var url_base = "${url( url_args )}"; + var url = url_base.replace("PAGE", page_num); + self.location = url; + } + </script> +</%def> + +<%def name="stylesheets()"> + ${h.css( "base", "autocomplete_tagging" )} + <style> + ## Not generic to all grids -- move to base? + .count-box { + min-width: 1.1em; + padding: 5px; + border-width: 1px; + border-style: solid; + text-align: center; + display: inline-block; + } + </style> +</%def> + +<%namespace file="./grid_common.mako" import="*" /> + +## Print grid header. +<%def name="grid_header()"> + <div class="grid-header"> + <h2>${grid.title}</h2> + + %if grid.global_actions: + <ul class="manage-table-actions"> + %for action in grid.global_actions: + <li> + <a class="action-button" href="${h.url_for( **action.url_args )}">${action.label}</a> + </li> + %endfor + </ul> + %endif + + ${render_grid_filters()} + </div> +</%def> + +## Print grid. +<%def name="grid_table()"> + <form action="${url()}" method="post" > + <table class="grid"> + <thead> + <tr> + <th></th> + %for column in grid.columns: + %if column.visible: + <% + href = "" + extra = "" + if column.sortable: + if sort_key == column.key: + if sort_order == "asc": + href = url( sort=( "-" + column.key ) ) + extra = "↓" + else: + href = url( sort=( column.key ) ) + extra = "↑" + else: + href = url( sort=column.key ) + %> + <th\ + %if column.ncells > 1: + colspan="${column.ncells}" + %endif + > + %if href: + <a href="${href}">${column.label}</a> + %else: + ${column.label} + %endif + <span>${extra}</span> + </th> + %endif + %endfor + <th></th> + </tr> + </thead> + <tbody> + %for i, item in enumerate( query ): + <tr \ + %if current_item == item: + class="current" \ + %endif + > + ## Item selection column + <td style="width: 1.5em;"> + <input type="checkbox" name="id" value=${trans.security.encode_id( item.id )} class="grid-row-select-checkbox" /> + </td> + ## Data columns + %for column in grid.columns: + %if column.visible: + <% + # Link + link = column.get_link( trans, grid, item ) + if link: + href = url( **link ) + else: + href = None + # Value (coerced to list so we can loop) + value = column.get_value( trans, grid, item ) + if column.ncells == 1: + value = [ value ] + %> + %for cellnum, v in enumerate( value ): + <% + # Handle non-ascii chars. + if isinstance(v, str): + v = unicode(v, 'utf-8') + # Attach popup menu? + if column.attach_popup and cellnum == 0: + extra = '<a id="grid-%d-popup" class="arrow" style="display: none;"><span>▼</span></a>' % i + else: + extra = "" + %> + %if href: + <td><div class="menubutton split" style="float: left;"><a class="label" href="${href}">${v}</a>${extra}</td> + %else: + <td >${v}${extra}</td> + %endif + %endfor + %endif + %endfor + ## Actions column + <td> + <div popupmenu="grid-${i}-popup"> + %for operation in grid.operations: + %if operation.allowed( item ): + <% + target = "" + if operation.target: + target = "target='" + operation.target + "'" + %> + <a class="action-button" ${target} href="${url( operation=operation.label, id=item.id )}">${operation.label}</a> + %endif + %endfor + </div> + </td> + </tr> + %endfor + </tbody> + <tfoot> + ## Row for navigating among pages. + %if num_pages > 1: + <tr> + <td></td> + <td colspan="100"> + Page ${cur_page_num} of ${num_pages} +     Go to: + ## Next page link. + %if cur_page_num != num_pages: + <% args = { "page" : cur_page_num+1 } %> + <span><a href="${url( args )}">Next</a></span> + %endif + ## Previous page link. + %if cur_page_num != 1: + <span>|</span> + <% args = { "page" : cur_page_num-1 } %> + <span><a href="${url( args )}">Previous</a></span> + %endif + ## Go to page select box. + <span>| Select:</span> + <select id="page-select" onchange="navigate_to_page(this)"> + <option value=""></option> + %for page_index in range(1, num_pages + 1): + %if page_index == cur_page_num: + continue + %else: + <% args = { "page" : page_index } %> + <option value='${page_index}'>Page ${page_index}</option> + %endif + %endfor + </select> + ## Show all link. + <% args = { "page" : "all" } %> + <span>| <a href="${url( args )}">Show all histories on one page</a></span> + </td> + </tr> + %endif + <tr> + ## Grid operations. + <td></td> + <td colspan="100"> + <% + # Mapping between item class and plural term for item. + plural = "items" + if grid.model_class == History: + plural = "histories" + elif grid.model_class == HistoryDatasetAssociation: + plural = "datasets" + %> + For <span class="grid-selected-count"></span> selected ${plural}: + %for operation in grid.operations: + %if operation.allow_multiple: + <input type="submit" name="operation" value="${operation.label}" class="action-button"> + %endif + %endfor + </td> + </tr> + </tfoot> + </table> + </form> +</%def> \ No newline at end of file diff -r 736b4ebcd9db -r cc3e5d4538db templates/grid_common.mako --- a/templates/grid_common.mako Mon Nov 09 12:21:32 2009 -0500 +++ b/templates/grid_common.mako Mon Nov 09 14:07:16 2009 -0500 @@ -73,57 +73,52 @@ ## Print grid search/filtering UI. <%def name="render_grid_filters()"> - <div class="grid-header"> - <h2>${grid.title}</h2> - - ## Default search. - <div> - <table><tr> - <td> - <table> - %for column in grid.columns: - %if column.filterable == "default": - ${render_grid_column_filter(column)} - %endif - %endfor - </table> - </td> - <td> - ##| - ##<% filter_all = GridColumnFilter( "", { column.key : "All" } ) %> - ##<a href="${url( filter_all.get_url_args() )}">Clear All</a> - | <a href="" onclick="javascript:$('#more-search-options').slideToggle('fast');return false;">Advanced Search</a> - </td> - </tr></table> - </div> - - - ## Advanced search. - <div id="more-search-options" style="display: none; padding-top: 5px"> - <table style="border: 1px solid gray;"> - <tr><td style="text-align: left" colspan="100"> - Advanced Search | - <a href=""# onclick="javascript:$('#more-search-options').slideToggle('fast');return false;">Close</a> | - ## Link to clear all filters. - <% - no_filter = GridColumnFilter("Clear All", default_filter_dict) - %> - <a href="${url( no_filter.get_url_args() )}">${no_filter.label}</a> - </td></tr> - %for column in grid.columns: - %if column.filterable == "advanced": - ## Show div if current filter has value that is different from the default filter. - %if column.key in cur_filter_dict and column.key in default_filter_dict and \ - cur_filter_dict[column.key] != default_filter_dict[column.key]: - <script type="text/javascript"> - $('#more-search-options').css("display", "block"); - </script> - %endif - - ${render_grid_column_filter(column)} + ## Standard search. + <div> + <table><tr> + <td> + <table> + %for column in grid.columns: + %if column.filterable == "standard": + ${render_grid_column_filter(column)} %endif %endfor - </table> - </div> + </table> + </td> + <td> + ##| + ##<% filter_all = GridColumnFilter( "", { column.key : "All" } ) %> + ##<a href="${url( filter_all.get_url_args() )}">Clear All</a> + | <a href="" onclick="javascript:$('#more-search-options').slideToggle('fast');return false;">Advanced Search</a> + </td> + </tr></table> + </div> + + ## Advanced search. + <div id="more-search-options" style="display: none; padding-top: 5px"> + <table style="border: 1px solid gray;"> + <tr><td style="text-align: left" colspan="100"> + Advanced Search | + <a href=""# onclick="javascript:$('#more-search-options').slideToggle('fast');return false;">Close</a> | + ## Link to clear all filters. + <% + no_filter = GridColumnFilter("Clear All", default_filter_dict) + %> + <a href="${url( no_filter.get_url_args() )}">${no_filter.label}</a> + </td></tr> + %for column in grid.columns: + %if column.filterable == "advanced": + ## Show div if current filter has value that is different from the default filter. + %if column.key in cur_filter_dict and column.key in default_filter_dict and \ + cur_filter_dict[column.key] != default_filter_dict[column.key]: + <script type="text/javascript"> + $('#more-search-options').css("display", "block"); + </script> + %endif + + ${render_grid_column_filter(column)} + %endif + %endfor + </table> </div> </%def> \ No newline at end of file diff -r 736b4ebcd9db -r cc3e5d4538db templates/history/grid.mako --- a/templates/history/grid.mako Mon Nov 09 12:21:32 2009 -0500 +++ b/templates/history/grid.mako Mon Nov 09 14:07:16 2009 -0500 @@ -1,311 +1,1 @@ -<%! from galaxy.web.framework.helpers.grids import TextColumn, GridColumnFilter %> - -<%inherit file="/base.mako"/> -<%def name="title()">${grid.title}</%def> - -%if message: - <p> - <div class="${message_type}message transient-message">${message}</div> - <div style="clear: both"></div> - </p> -%endif - -<%def name="javascripts()"> - ${parent.javascripts()} - ${h.js("jquery.autocomplete", "autocomplete_tagging" )} - <script type="text/javascript"> - ## TODO: generalize and move into galaxy.base.js - $(document).ready(function() { - $(".grid").each( function() { - var grid = this; - var checkboxes = $(this).find("input.grid-row-select-checkbox"); - var update = $(this).find( "span.grid-selected-count" ); - $(checkboxes).each( function() { - $(this).change( function() { - var n = $(checkboxes).filter("[checked]").size(); - update.text( n ); - }); - }) - }); - - // Set up autocomplete for tag filter input. - var t = $("#input-tags-filter"); - - var autocomplete_options = - { selectFirst: false, autoFill: false, highlight: false, mustMatch: false }; - - t.autocomplete("${h.url_for( controller='tag', action='tag_autocomplete_data', item_class='History' )}", autocomplete_options); - - // Set up autocomplete for name filter input. - var t2 = $("#input-name-filter"); - - var autocomplete_options = - { selectFirst: false, autoFill: false, highlight: false, mustMatch: false }; - - t2.autocomplete("${h.url_for( controller='history', action='name_autocomplete_data' )}", autocomplete_options); - }); - ## Can this be moved into base.mako? - %if refresh_frames: - %if 'masthead' in refresh_frames: - ## Refresh masthead == user changes (backward compatibility) - if ( parent.user_changed ) { - %if trans.user: - parent.user_changed( "${trans.user.email}", ${int( app.config.is_admin_user( trans.user ) )} ); - %else: - parent.user_changed( null, false ); - %endif - } - %endif - %if 'history' in refresh_frames: - if ( parent.frames && parent.frames.galaxy_history ) { - parent.frames.galaxy_history.location.href="${h.url_for( controller='root', action='history')}"; - if ( parent.force_right_panel ) { - parent.force_right_panel( 'show' ); - } - } - %endif - %if 'tools' in refresh_frames: - if ( parent.frames && parent.frames.galaxy_tools ) { - parent.frames.galaxy_tools.location.href="${h.url_for( controller='root', action='tool_menu')}"; - if ( parent.force_left_panel ) { - parent.force_left_panel( 'show' ); - } - } - %endif - %endif - - // Filter and sort args for grid. - var filter_args = ${h.to_json_string(cur_filter_dict)}; - var sort_key = "${sort_key}"; - - // - // Add tag to grid filter. - // - function add_tag_to_grid_filter(tag_name, tag_value) - { - // Put tag name and value together. - var tag = tag_name + (tag_value != null && tag_value != "" ? ":" + tag_value : ""); - add_condition_to_grid_filter("tags", tag, true); - } - - // - // Add a filter to the current grid filter; this adds the filter and then issues a request to refresh the grid. - // - function add_condition_to_grid_filter(name, value, append) - { - // Update filter arg with new condition. - if (append) - { - // Append value. - var cur_val = filter_args[name]; - if (cur_val != "All") - cur_val = cur_val + ", " + value; - else - cur_val = value; - filter_args[name] = cur_val; - } - else - { - // Replace value. - filter_args[name] = value; - } - - // Build URL with filter args, sort key. - var filter_arg_value_strs = new Array(); - var i = 0; - for (arg in filter_args) - { - filter_arg_value_strs[i++] = "f-" + arg + "=" + filter_args[arg]; - } - var filter_str = filter_arg_value_strs.join("&"); - var url_base = "${h.url_for( controller='history', action='list')}"; - var url = url_base + "?" + filter_str + "&sort=" + sort_key; - self.location = url; - } - - // - // Initiate navigation when user selects a page to view. - // - function navigate_to_page(page_select) - { - page_num = $(page_select).val(); - <% url_args = {"page" : "PAGE"} %> - var url_base = "${url( url_args )}"; - var url = url_base.replace("PAGE", page_num); - self.location = url; - } - - </script> -</%def> - -<%def name="stylesheets()"> - ${h.css( "base", "autocomplete_tagging" )} - <style> - ## Not generic to all grids -- move to base? - .count-box { - min-width: 1.1em; - padding: 5px; - border-width: 1px; - border-style: solid; - text-align: center; - display: inline-block; - } - </style> -</%def> - -<%namespace file="../grid_common.mako" import="*" /> - -## Print grid header. -${render_grid_filters()} - -## Print grid. -<form name="history_actions" action="${url()}" method="post" > - <input type="hidden" name="page" value="${cur_page_num}"> - <table class="grid"> - <thead> - <tr> - <th></th> - %for column in grid.columns: - %if column.visible: - <% - href = "" - extra = "" - if column.sortable: - if sort_key == column.key: - if sort_order == "asc": - href = url( sort=( "-" + column.key ) ) - extra = "↓" - else: - href = url( sort=( column.key ) ) - extra = "↑" - else: - href = url( sort=column.key ) - %> - <th\ - %if column.ncells > 1: - colspan="${column.ncells}" - %endif - > - %if href: - <a href="${href}">${column.label}</a> - %else: - ${column.label} - %endif - <span>${extra}</span> - </th> - %endif - %endfor - <th></th> - </tr> - </thead> - <tbody> - %for i, item in enumerate( query ): - <tr \ - %if current_item == item: - class="current" \ - %endif - > - ## Item selection column - <td style="width: 1.5em;"> - <input type="checkbox" name="id" value=${trans.security.encode_id( item.id )} class="grid-row-select-checkbox" /> - </td> - ## Data columns - %for column in grid.columns: - %if column.visible: - <% - # Link - link = column.get_link( trans, grid, item ) - if link: - href = url( **link ) - else: - href = None - # Value (coerced to list so we can loop) - value = column.get_value( trans, grid, item ) - if column.ncells == 1: - value = [ value ] - %> - %for cellnum, v in enumerate( value ): - <% - # Attach popup menu? - if column.attach_popup and cellnum == 0: - extra = '<a id="grid-%d-popup" class="arrow" style="display: none;"><span>▼</span></a>' % i - else: - extra = "" - %> - %if href: - <td><div class="menubutton split" style="float: left;"><a class="label" href="${href}">${v}</a>${extra}</td> - %else: - <td >${v}${extra}</td> - %endif - %endfor - %endif - %endfor - ## Actions column - <td> - <div popupmenu="grid-${i}-popup"> - %for operation in grid.operations: - %if operation.allowed( item ): - <a class="action-button" href="${url( operation=operation.label, id=item.id )}">${operation.label}</a> - %endif - %endfor - </div> - </td> - </tr> - %endfor - </tbody> - <tfoot> - ## Row for navigating among pages. - %if num_pages > 1: - <tr> - <td></td> - <td colspan="100"> - Page ${cur_page_num} of ${num_pages} -     Go to: - ## Next page link. - %if cur_page_num != num_pages: - <% args = { "page" : cur_page_num+1 } %> - <span><a href="${url( args )}">Next</a></span> - %endif - ## Previous page link. - %if cur_page_num != 1: - <span>|</span> - <% args = { "page" : cur_page_num-1 } %> - <span><a href="${url( args )}">Previous</a></span> - %endif - ## Go to page select box. - <span>| Select:</span> - <select id="page-select" onchange="navigate_to_page(this)"> - <option value=""></option> - %for page_index in range(1, num_pages + 1): - %if page_index == cur_page_num: - continue - %else: - <% args = { "page" : page_index } %> - <option value='${page_index}'>Page ${page_index}</option> - %endif - %endfor - </select> - ## Show all link. - <% args = { "page" : "all" } %> - <span>| <a href="${url( args )}">Show all histories on one page</a></span> - - - </td> - </tr> - %endif - %if grid.operations: - <tr> - <td></td> - <td colspan="100"> - For <span class="grid-selected-count"></span> selected histories: - %for operation in grid.operations: - %if operation.allow_multiple: - <input type="submit" name="operation" value="${operation.label}" class="action-button"> - %endif - %endfor - </td> - </tr> - %endif - </tfoot> - </table> -</form> +<%inherit file="/grid_base.mako"/>

1 0

Re: [galaxy-dev] [galaxy-bugs] Galaxy tool error report from u4705270@hotmail.com
by Kelly Vincent 09 Nov '09

09 Nov '09

Hi, Could you possibly share your history with me (making sure to include all of the files you used to get to the point where it fails) at kpvincent(a)bx.psu.edu ? I can't really tell what the problem is from this error. There appear to be a couple of things wrong (the index of the BAM file doesn't get created and then Samtools seg faults when it tries to index the reference file). With your actual files, I can look into the failures in more depth. Regards, Kelly On Nov 8, 2009, at 9:50 PM, galaxy-bugs(a)bx.psu.edu wrote: > > GALAXY TOOL ERROR REPORT > ------------------------ > > This error report was sent from the Galaxy instance hosted on the > server > "main.g2.bx.psu.edu" > ----------------------------------------------------------------------------- > This is in reference to output dataset 913904. > ----------------------------------------------------------------------------- > The user 'u4705270(a)hotmail.com' provided the following information: > I have problem when I use SAM file from BWA to transform to BAM in > SAM tool. > sh: line 1: 32286 Segmentation fault samtools faidx /galaxy/ > home/g2main/galaxy_main/database/tmp/framework/tmpGSqkyx 2> /dev/null > sh: line 1: 32291 Segmentation fault samtools sort /galaxy/home/ > g2main/galaxy_main/database/tmp/framework/tmpdokBYv /galaxy/home/ > g2main/galaxy_main/database/tmp/framework/tmpU-Dbdm 2> /dev/null > lseek: Invalid argument > [bam_header_read] read from pipe; skip EOF checking. > There was a problem creating the index for the BAM file > > ----------------------------------------------------------------------------- > job id: 676933 > tool id: sam_to_bam > ----------------------------------------------------------------------------- > job stderr: > sh: line 1: 32286 Segmentation fault samtools faidx /galaxy/ > home/g2main/galaxy_main/database/tmp/framework/tmpGSqkyx 2> /dev/null > sh: line 1: 32291 Segmentation fault samtools sort /galaxy/home/ > g2main/galaxy_main/database/tmp/framework/tmpdokBYv /galaxy/home/ > g2main/galaxy_main/database/tmp/framework/tmpU-Dbdm 2> /dev/null > lseek: Invalid argument > [bam_header_read] read from pipe; skip EOF checking. > There was a problem creating the index for the BAM file > > ----------------------------------------------------------------------------- > job stdout: > > ----------------------------------------------------------------------------- > job info: > None > ----------------------------------------------------------------------------- > job traceback: > None > ----------------------------------------------------------------------------- > (This is an automated message). > _______________________________________________ > galaxy-bugs mailing list > galaxy-bugs(a)bx.psu.edu > http://mail.bx.psu.edu/cgi-bin/mailman/listinfo/galaxy-bugs

1 0

Re: [galaxy-dev] OS X dev build attempt
by Art Poon 09 Nov '09

09 Nov '09

Dear colleagues, I'm attempting to install a local instance of Galaxy for development purposes on my Mac. The Galaxy build script issued the following warning: > Your platform (py2.5-macosx-10.6-i386-ucs2) is not supported. > Pre-built galaxy eggs are not available from the Galaxy developers for > your platform. You may be able to build them by hand with: > python scripts/scramble.py Upon running scramble.py, it turned out that the link to pysqlite in eggs.ini is broken: http://initd.org/pub/software/pysqlite/releases/2.3/2.3.5/pysqlite-2.3.5.ta… so I replaced the corresponding line in the eggs.ini file with: http://pysqlite.googlecode.com/files/pysqlite-2.5.5.tar.gz http://www.sqlite.org/sqlite-source-3_5_4.zip (I haven't yet located a link to pysqlite 2.3.5 on the web.) This immediately created a problem with SQLAlchemy and sqlalchemy_migrate: > File "/Users/apoon/Source/galaxy/eggs/py2.5-noplatform/ > SQLAlchemy-0.4.7p1-py2.5.egg/sqlalchemy/engine/base.py", line 942, > in _handle_dbapi_exception > raise exceptions.DBAPIError.instance(statement, parameters, e, > connection_invalidated=is_disconnect) > ProgrammingError: (ProgrammingError) Cannot operate on a closed > cursor. None None Googled the respective error messages and found that there's a version conflict with pysqlite 2.5.5. So those got updated as well, with the corresponding line edits to eggs.ini. So far so good. But then run.sh exited with another problem: > File "lib/galaxy/model/migrate/versions/ > 0005_cleanup_datasets_fix.py", line 665, in upgrade > for dataset in context.query( Dataset ).filter( and_ > ( Dataset.c.deleted == True, Dataset.c.purged == False ) ): > AttributeError: type object 'Dataset' has no attribute 'c' I poked around in that script and found that while class Dataset has no attribute 'c', it sure has attributes 'deleted' and 'purged'. So I changed that line to: > for dataset in context.query( Dataset ).filter( and_ > ( Dataset.deleted == True, Dataset.purged == False ) ): Re-ran run.sh, got asked to migrate the database scheme, so sh manage_db.sh upgrade it is, followed with another run.sh and hey, presto! My Mac is running Galaxy. ^_^ Cheers, - Art.

4 3

setting per-tools parameters for SGE job runner
by Andreas Kuntzagk 09 Nov '09

09 Nov '09

Hi, I have galaxy running now with SGE job runners. I also managed to set PATH now using .sge_request. What I want to do now is to set some SGE parameters for some special tools which need special parameters (e.q. a parallel env. ) Is there a way to set them in galaxy (maybe using the job runner URL)? Or do I need to write wrappers? thanks, Andreas

4 12

Error message in executing NGS tool Quality format converter
by Vipin TS 09 Nov '09

09 Nov '09

Hi all, I am working on a local instance of Galaxy NGS tools system. I am using a tool 'Quality format converter' but it fails to give the result. Here is the error message. An error occurred running this job: */home/galaxy/galaxy-2/database/pbs/galaxy_16459.sh: line 13: fastq_quality_converter: command not found* >From this I understood that 'fastq_quality_converter' script/file is missing. if I am wrong please let me know. Also I am not finding such a script/file in my local instance galaxy tool directory. Many thanks in advance, Vipin T S

1 0

[hg] galaxy 2982: Comment out Galaxy tools from page editor unti...
by Greg Von Kuster 07 Nov '09

07 Nov '09

details: http://www.bx.psu.edu/hg/galaxy/rev/678e8507a90d changeset: 2982:678e8507a90d user: jeremy goecks <jeremy.goecks(a)emory.edu> date: Fri Nov 06 19:11:30 2009 -0500 description: Comment out Galaxy tools from page editor until functional. diffstat: static/scripts/jquery.wymeditor.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r fd44bca54484 -r 678e8507a90d static/scripts/jquery.wymeditor.js --- a/static/scripts/jquery.wymeditor.js Fri Nov 06 19:08:03 2009 -0500 +++ b/static/scripts/jquery.wymeditor.js Fri Nov 06 19:11:30 2009 -0500 @@ -446,7 +446,7 @@ + "<ul>" + WYMeditor.TOOLS_ITEMS // Add Galaxy Tools. - + Galaxy.TOOLS_ITEMS + //+ Galaxy.TOOLS_ITEMS + "</ul>" + "</div>", @@ -862,7 +862,7 @@ } } - boxHtml = h.replaceAll(boxHtml, Galaxy.TOOLS_ITEMS, sTools); + //boxHtml = h.replaceAll(boxHtml, Galaxy.TOOLS_ITEMS, sTools); //construct classes list var aClasses = eval(this._options.classesItems);

1 0

[hg] galaxy 2983: Change fuctional test output test files for ag...
by Greg Von Kuster 07 Nov '09

07 Nov '09

details: http://www.bx.psu.edu/hg/galaxy/rev/144abb3b14bc changeset: 2983:144abb3b14bc user: Greg Von Kuster <greg(a)bx.psu.edu> date: Sat Nov 07 10:30:20 2009 -0500 description: Change fuctional test output test files for aggregate scores tool due to upgrade of numpy - upped the tool version. diffstat: test-data/aggregate_binned_scores_in_intervals.out | 16 ++++++++-------- test-data/aggregate_binned_scores_in_intervals3.out | 2 +- tools/stats/aggregate_binned_scores_in_intervals.xml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diffs (40 lines): diff -r 678e8507a90d -r 144abb3b14bc test-data/aggregate_binned_scores_in_intervals.out --- a/test-data/aggregate_binned_scores_in_intervals.out Fri Nov 06 19:11:30 2009 -0500 +++ b/test-data/aggregate_binned_scores_in_intervals.out Sat Nov 07 10:30:20 2009 -0500 @@ -1,10 +1,10 @@ -chr7 115444712 115444739 CCDS5763.1_cds_0_0_chr7_115444713_f 0 + 0.842925922462 0.0590000003576 1.0 -chr7 115468538 115468624 CCDS5763.1_cds_1_0_chr7_115468539_f 0 + 0.999697674152 0.981999993324 1.0 -chr7 115483024 115483277 CCDS5763.1_cds_2_0_chr7_115483025_f 0 + 0.99544268823 0.837000012398 1.0 +chr7 115444712 115444739 CCDS5763.1_cds_0_0_chr7_115444713_f 0 + 0.842925922462 0.059 1.0 +chr7 115468538 115468624 CCDS5763.1_cds_1_0_chr7_115468539_f 0 + 0.999697674152 0.982 1.0 +chr7 115483024 115483277 CCDS5763.1_cds_2_0_chr7_115483025_f 0 + 0.99544268823 0.837 1.0 chr7 115484165 115484501 CCDS5763.1_cds_3_0_chr7_115484166_f 0 + 0.750726190992 0.0 1.0 -chr7 115485764 115485980 CCDS5763.1_cds_4_0_chr7_115485765_f 0 + 0.984907407314 0.354000002146 1.0 -chr7 115486322 115486481 CCDS5763.1_cds_5_0_chr7_115486323_f 0 + 0.994924527669 0.739000022411 1.0 -chr7 115491298 115491487 CCDS5763.1_cds_6_0_chr7_115491299_f 0 + 0.946195768256 0.00700000021607 1.0 -chr7 115468538 115468624 CCDS5764.1_cds_0_0_chr7_115468539_f 0 + 0.999697674152 0.981999993324 1.0 -chr7 115483024 115483277 CCDS5764.1_cds_1_0_chr7_115483025_f 0 + 0.99544268823 0.837000012398 1.0 +chr7 115485764 115485980 CCDS5763.1_cds_4_0_chr7_115485765_f 0 + 0.984907407314 0.354 1.0 +chr7 115486322 115486481 CCDS5763.1_cds_5_0_chr7_115486323_f 0 + 0.994924527669 0.739 1.0 +chr7 115491298 115491487 CCDS5763.1_cds_6_0_chr7_115491299_f 0 + 0.946195768256 0.007 1.0 +chr7 115468538 115468624 CCDS5764.1_cds_0_0_chr7_115468539_f 0 + 0.999697674152 0.982 1.0 +chr7 115483024 115483277 CCDS5764.1_cds_1_0_chr7_115483025_f 0 + 0.99544268823 0.837 1.0 chr7 115484165 115484501 CCDS5764.1_cds_2_0_chr7_115484166_f 0 + 0.750726190992 0.0 1.0 diff -r 678e8507a90d -r 144abb3b14bc test-data/aggregate_binned_scores_in_intervals3.out --- a/test-data/aggregate_binned_scores_in_intervals3.out Fri Nov 06 19:11:30 2009 -0500 +++ b/test-data/aggregate_binned_scores_in_intervals3.out Sat Nov 07 10:30:20 2009 -0500 @@ -1,4 +1,4 @@ -chr7 115444712 115444739 CCDS5763.1_cds_0_0_chr7_115444713_f 0 + 0.904053741031 0.559054970741 1.0 +chr7 115444712 115444739 CCDS5763.1_cds_0_0_chr7_115444713_f 0 + 0.904053741031 0.559055 1.0 chr7 115468538 115468624 CCDS5763.1_cds_1_0_chr7_115468539_f 0 + nan nan nan chr7 115483024 115483277 CCDS5763.1_cds_2_0_chr7_115483025_f 0 + nan nan nan chr7 115484165 115484501 CCDS5763.1_cds_3_0_chr7_115484166_f 0 + nan nan nan diff -r 678e8507a90d -r 144abb3b14bc tools/stats/aggregate_binned_scores_in_intervals.xml --- a/tools/stats/aggregate_binned_scores_in_intervals.xml Fri Nov 06 19:11:30 2009 -0500 +++ b/tools/stats/aggregate_binned_scores_in_intervals.xml Sat Nov 07 10:30:20 2009 -0500 @@ -1,4 +1,4 @@ -<tool id="aggregate_scores_in_intervals2" description="such as phastCons, GERP, binCons, and others for a set of genomic intervals" name="Aggregate datapoints" version="1.1.1"> +<tool id="aggregate_scores_in_intervals2" description="such as phastCons, GERP, binCons, and others for a set of genomic intervals" name="Aggregate datapoints" version="1.1.2"> <description>Appends the average, min, max of datapoints per interval</description> <command interpreter="python"> #if $score_source_type.score_source == "user":#aggregate_scores_in_intervals.py $score_source_type.input2 $input1 ${input1.metadata.chromCol} ${input1.metadata.startCol} ${input1.metadata.endCol} $out_file1 --chrom_buffer=3

1 0

[hg] galaxy 2981: Groundwork for Galaxy-specific commands in pag...
by Greg Von Kuster 07 Nov '09

07 Nov '09

details: http://www.bx.psu.edu/hg/galaxy/rev/fd44bca54484 changeset: 2981:fd44bca54484 user: jeremy goecks <jeremy.goecks(a)emory.edu> date: Fri Nov 06 19:08:03 2009 -0500 description: Groundwork for Galaxy-specific commands in page editor. diffstat: lib/galaxy/web/controllers/page.py | 123 ++++++++++++++++++++++++++++++++++++++++- templates/page/editor.mako | 47 +++++++++++++++- 2 files changed, 167 insertions(+), 3 deletions(-) diffs (214 lines): diff -r f520e80ac09c -r fd44bca54484 lib/galaxy/web/controllers/page.py --- a/lib/galaxy/web/controllers/page.py Fri Nov 06 19:04:13 2009 -0500 +++ b/lib/galaxy/web/controllers/page.py Fri Nov 06 19:08:03 2009 -0500 @@ -68,11 +68,126 @@ ] def apply_default_filter( self, trans, query, **kwargs ): return query.filter_by( deleted=False, published=True ) + +# Custom column types +class NameColumn( grids.GridColumn ): + def __init( self, key, link, attach_popup, filterable ): + grids.GridColumn.__init__(self, key, link, attach_popup) + + def get_value( self, trans, grid, history ): + return history.get_display_name() + + def filter( self, db_session, query, column_filter ): + """ Modify query to filter histories by name. """ + if column_filter == "All": + pass + elif column_filter: + query = query.filter( func.lower( History.name ).like( "%" + column_filter.lower() + "%" ) ) + return query + def get_accepted_filters( self ): + """ Returns a list of accepted filters for this column. """ + accepted_filter_labels_and_vals = odict() + accepted_filter_labels_and_vals["FREETEXT"] = "FREETEXT" + accepted_filters = [] + for label, val in accepted_filter_labels_and_vals.iteritems(): + args = { self.key: val } + accepted_filters.append( grids.GridColumnFilter( label, args) ) + return accepted_filters + +class TagsColumn( grids.GridColumn ): + def __init__( self, col_name, key, filterable ): + grids.GridColumn.__init__(self, col_name, key=key, filterable=filterable) + # Tags cannot be sorted. + self.sortable = False + self.tag_elt_id_gen = 0 + def get_value( self, trans, grid, history ): + self.tag_elt_id_gen += 1 + elt_id="tagging-elt" + str( self.tag_elt_id_gen ) + div_elt = "<div id=%s></div>" % elt_id + return div_elt + trans.fill_template( "/tagging_common.mako", trans=trans, tagged_item=history, + elt_id = elt_id, in_form="true", input_size="20", tag_click_fn="add_tag_to_grid_filter" ) + def filter( self, db_session, query, column_filter ): + """ Modify query to filter histories by tag. """ + if column_filter == "All": + pass + elif column_filter: + # Parse filter to extract multiple tags. + tag_handler = TagHandler() + raw_tags = tag_handler.parse_tags( column_filter.encode("utf-8") ) + for name, value in raw_tags.items(): + if name: + # Search for tag names. + query = query.filter( History.tags.any( func.lower( model.HistoryTagAssociation.user_tname ).like( "%" + name.lower() + "%" ) ) ) + if value: + # Search for tag values. + query = query.filter( History.tags.any( func.lower( model.HistoryTagAssociation.user_value ).like( "%" + value.lower() + "%" ) ) ) + return query + def get_accepted_filters( self ): + """ Returns a list of accepted filters for this column. """ + accepted_filter_labels_and_vals = odict() + accepted_filter_labels_and_vals["FREETEXT"] = "FREETEXT" + accepted_filters = [] + for label, val in accepted_filter_labels_and_vals.iteritems(): + args = { self.key: val } + accepted_filters.append( grids.GridColumnFilter( label, args) ) + return accepted_filters + +class FreeTextSearchColumn( grids.GridColumn ): + def filter( self, db_session, query, column_filter ): + """ Modify query to search tags and history names. """ + if column_filter == "All": + pass + elif column_filter: + # Build tags filter. + tag_handler = TagHandler() + raw_tags = tag_handler.parse_tags( column_filter.encode("utf-8") ) + tags_filter = None + for name, value in raw_tags.items(): + if name: + # Search for tag names. + tags_filter = History.tags.any( func.lower( model.HistoryTagAssociation.user_tname ).like( "%" + name.lower() + "%" ) ) + if value: + # Search for tag values. + tags_filter = and_( tags_filter, func.lower( History.tags.any( model.HistoryTagAssociation.user_value ).like( "%" + value.lower() + "%" ) ) ) + + # Build history name filter. + history_name_filter = func.lower( History.name ).like( "%" + column_filter.lower() + "%" ) + + # Apply filters to query. + if tags_filter: + query = query.filter( or_( tags_filter, history_name_filter ) ) + else: + query = query.filter( history_name_filter ) + return query + def get_accepted_filters( self ): + """ Returns a list of accepted filters for this column. """ + accepted_filter_labels_and_vals = odict() + accepted_filter_labels_and_vals["FREETEXT"] = "FREETEXT" + accepted_filters = [] + for label, val in accepted_filter_labels_and_vals.iteritems(): + args = { self.key: val } + accepted_filters.append( grids.GridColumnFilter( label, args) ) + return accepted_filters + +class HistorySelectionGrid( grids.Grid ): + # Grid definition. + template='/page/history_selection_grid.mako' + title = "Saved Histories" + model_class = model.History + default_sort_key = "-update_time" + columns = [ + NameColumn( "Name", key="name", filterable=True ), + TagsColumn( "Tags", key="tags", filterable=True), + grids.GridColumn( "Last Updated", key="update_time", format=time_ago ), + # Columns that are valid for filtering but are not visible. + FreeTextSearchColumn( "Search", key="free-text-search", visible=False ) # Not filterable because it's the default search. + ] class PageController( BaseController ): _page_list = PageListGrid() _all_published_list = PageAllPublishedGrid() + _history_selection_grid = HistorySelectionGrid() @web.expose @web.require_login() @@ -239,5 +354,9 @@ if page is None: raise web.httpexceptions.HTTPNotFound() return trans.fill_template( "page/display.mako", page=page ) - - + + @web.expose + @web.require_login("select a history from saved histories") + def list_histories_for_selection( self, trans, **kwargs ): + # Render the list view + return self._history_selection_grid( trans, status=status, message=message, **kwargs ) \ No newline at end of file diff -r f520e80ac09c -r fd44bca54484 templates/page/editor.mako --- a/templates/page/editor.mako Fri Nov 06 19:04:13 2009 -0500 +++ b/templates/page/editor.mako Fri Nov 06 19:08:03 2009 -0500 @@ -36,6 +36,8 @@ <script type='text/javascript' src="${h.url_for('/static/scripts/jquery.wymeditor.js')}"> </script> + <script type='text/javascript' src="${h.url_for('/static/scripts/jquery.autocomplete.js')}"> </script> + <script type="text/javascript"> ## Completely replace WYM's dialog handling WYMeditor.editor.prototype.dialog = function( dialogType, dialogFeatures, bodyHtml ) { @@ -181,7 +183,49 @@ hide_modal(); } } - ) + ); + } + + // HISTORY DIALOG + if ( dialogType == Galaxy.DIALOG_HISTORY ) { + show_modal( + "Insert History", + "<div class='row'>" + + "<label>History Name</label><br>" + + "<input id='history_name_input' type='text' class='wym_galaxy_history_name' value='' size='40' />" + + "</div>" + + "<div class='row'>" + + "<label>Select History</label><br>" + + "<input type='text' class='wym_galaxy_history_selected' value='' size='40' />" + + "</div>" + , + { + "Insert": function() { + var sUrl = jQuery(wym._options.hrefSelector).val(); + if(sUrl.length > 0) { + + wym._exec(WYMeditor.CREATE_LINK, sStamp); + + jQuery("a[href=" + sStamp + "]", wym._doc.body) + .attr(WYMeditor.HREF, sUrl) + .attr(WYMeditor.TITLE, jQuery(wym._options.titleSelector).val()); + hide_modal(); + + // TODO: remove autocomplete. + }, + "Cancel": function() { + hide_modal(); + + // TODO: remove autocomplete. + } + } + ); + + // Set up autocomplete for name input. + var t = $("#history_name_input"); + var autocomplete_options = + { selectFirst: false, autoFill: false, highlight: false, mustMatch: false }; + t.autocomplete("${h.url_for( controller='history', action='name_autocomplete_data' )}", autocomplete_options); } }; </script> @@ -282,6 +326,7 @@ <%def name="stylesheets()"> ${parent.stylesheets()} + ${h.css( "autocomplete_tagging" )} </%def> <%def name="center_panel()">

1 0