- galaxy-dev - lists.galaxyproject.org

[hg] galaxy 3556: Fix bug in upload where source import files co...
by Greg Von Kuster 24 Mar '10

24 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/8f6fa47b21c4 changeset: 3556:8f6fa47b21c4 user: Nate Coraor <nate(a)bx.psu.edu> date: Tue Mar 23 12:45:08 2010 -0400 description: Fix bug in upload where source import files could be removed if an error occurs during detection and galaxy owns the source files. diffstat: tools/data_source/upload.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 4affff3421ed -r 8f6fa47b21c4 tools/data_source/upload.py --- a/tools/data_source/upload.py Tue Mar 23 10:44:13 2010 -0400 +++ b/tools/data_source/upload.py Tue Mar 23 12:45:08 2010 -0400 @@ -24,6 +24,9 @@ ext = 'data', dataset_id = dataset.dataset_id, stderr = msg ) ) + "\n" ) + # never remove a server-side upload + if dataset.type in ( 'server_dir', 'path_paste' ): + return try: os.remove( dataset.path ) except:

1 0

[hg] galaxy 3555: Added 'Multivariate analysis' section to tool_...
by Greg Von Kuster 24 Mar '10

24 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/4affff3421ed changeset: 3555:4affff3421ed user: gua110 date: Tue Mar 23 10:44:13 2010 -0400 description: Added 'Multivariate analysis' section to tool_conf.xml.main diffstat: tool_conf.xml.main | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r a2d3d9514c76 -r 4affff3421ed tool_conf.xml.main --- a/tool_conf.xml.main Tue Mar 23 10:09:12 2010 -0400 +++ b/tool_conf.xml.main Tue Mar 23 10:44:13 2010 -0400 @@ -141,6 +141,12 @@ <tool file="regVariation/best_regression_subsets.xml" /> <tool file="regVariation/rcve.xml" /> </section> + <section name="Multivariate Analysis" id="multVar"> + <tool file="multivariate_stats/pca.xml" /> + <tool file="multivariate_stats/cca.xml" /> + <tool file="multivariate_stats/kpca.xml" /> + <tool file="multivariate_stats/kcca.xml" /> + </section> <section name="Evolution" id="hyphy"> <tool file="hyphy/hyphy_branch_lengths_wrapper.xml" /> <tool file="hyphy/hyphy_nj_tree_wrapper.xml" />

1 0

[hg] galaxy 3554: lims: data transfer bug fix
by Greg Von Kuster 24 Mar '10

24 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/a2d3d9514c76 changeset: 3554:a2d3d9514c76 user: rc date: Tue Mar 23 10:09:12 2010 -0400 description: lims: data transfer bug fix diffstat: scripts/galaxy_messaging/server/data_transfer.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (26 lines): diff -r 96776367bea1 -r a2d3d9514c76 scripts/galaxy_messaging/server/data_transfer.py --- a/scripts/galaxy_messaging/server/data_transfer.py Mon Mar 22 18:02:40 2010 -0400 +++ b/scripts/galaxy_messaging/server/data_transfer.py Tue Mar 23 10:09:12 2010 -0400 @@ -158,11 +158,11 @@ cj = cookielib.CookieJar() opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj)) f = opener.open(url) - if f.read().find("Now logged in as "+self.datatx_email) == -1: + if f.read().find("ogged in as "+self.datatx_email) == -1: # if the user doesnt exist, create the user url = "%s/user/create?email=%s&username=%s&password=%s&confirm=%s&create_user_button=Submit" % ( base_url, self.datatx_email, self.datatx_email, self.datatx_password, self.datatx_password ) f = opener.open(url) - if f.read().find("Now logged in as "+self.datatx_email) == -1: + if f.read().find("ogged in as "+self.datatx_email) == -1: raise DataTransferException("The "+self.datatx_email+" user could not login to Galaxy") # after login, add dataset to the library params = urllib.urlencode(dict( cntrller='library_admin', @@ -185,7 +185,7 @@ raise DataTransferException("Dataset could not be uploaded to the data library") # finally logout f = opener.open(base_url+'/user/logout') - if f.read().find("You are no longer logged in.") == -1: + if f.read().find("You have been logged out.") == -1: raise DataTransferException("The "+self.datatx_email+" user could not logout of Galaxy") except DataTransferException, (e): self.error_and_exit(e.msg)

1 0

[hg] galaxy 3553: Least Recently Used (LRU) cache for python
by Greg Von Kuster 24 Mar '10

24 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/96776367bea1 changeset: 3553:96776367bea1 user: Kanwei Li <kanwei(a)gmail.com> date: Mon Mar 22 18:02:40 2010 -0400 description: Least Recently Used (LRU) cache for python diffstat: lib/galaxy/util/lrucache.py | 72 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diffs (77 lines): diff -r 2bda9c59b992 -r 96776367bea1 lib/galaxy/util/lrucache.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lib/galaxy/util/lrucache.py Mon Mar 22 18:02:40 2010 -0400 @@ -0,0 +1,72 @@ +""" +Kanwei Li, 03/2010 + +Simple LRU cache that uses a dictionary to store a specified number of objects +at a time. +""" + +class LRUCache: + def clear(self): + ''' Clears/initiates storage variables''' + self.key_ary = [] + self.obj_cache = {} + + def __init__(self, num_elements): + self.num_elements = num_elements + self.clear() + + def __getitem__(self, key): + ''' Return value of key, or None if key is not in cache ''' + try: + index = self.key_ary.index(key) + except ValueError: + return None + # Move this key to the end + self.key_ary.remove(key) + self.key_ary.append(key) + return self.obj_cache[key] + + def __setitem__(self, key, value): + ''' Sets a new value to a key ''' + if key not in self.obj_cache: + if len(self.key_ary) >= self.num_elements: + deleted_key = self.key_ary.pop(0) # Remove first element + del self.obj_cache[deleted_key] + self.key_ary.append(key) + self.obj_cache[key] = value + return value + +if __name__ == "__main__": + import unittest + + class TestLRUCache(unittest.TestCase): + def test_lru(self): + lru = LRUCache(2) + for i in range(0, 4): # Insert 4 numbers + lru[i] = i + self.assertEqual( lru[0], None ) + self.assertEqual( lru[1], None ) + self.assertEqual( lru[2], 2 ) + self.assertEqual( lru[3], 3 ) + + self.assertEqual( lru.__setitem__("hello", "world"), "world") + self.assertEqual( lru[2], None ) + + lru.clear() + self.assertEqual( lru["hello"], None ) + self.assertEqual( lru[3], None ) + + # Test if recently used item is kept + lru[0] = 0 + lru[1] = 1 + # Now saturated + ping = lru[0] + lru[2] = 2 + # Should keep 0, delete 1 + self.assertEqual( lru[0], 0 ) + self.assertEqual( lru[1], None ) + self.assertEqual( lru[2], 2 ) + + unittest.main() + + \ No newline at end of file

1 0

[hg] galaxy 3552: Fix saving annotations in workflow editor
by Greg Von Kuster 24 Mar '10

24 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/2bda9c59b992 changeset: 3552:2bda9c59b992 user: James Taylor <james(a)jamestaylor.org> date: Mon Mar 22 17:11:10 2010 -0400 description: Fix saving annotations in workflow editor diffstat: static/scripts/galaxy.workflow_editor.canvas.js | 6 +--- templates/workflow/editor.mako | 39 ++++++++++-------------- templates/workflow/editor_tool_form.mako | 15 +++++--- 3 files changed, 26 insertions(+), 34 deletions(-) diffs (104 lines): diff -r 84386da2a3f3 -r 2bda9c59b992 static/scripts/galaxy.workflow_editor.canvas.js --- a/static/scripts/galaxy.workflow_editor.canvas.js Mon Mar 22 16:59:20 2010 -0400 +++ b/static/scripts/galaxy.workflow_editor.canvas.js Mon Mar 22 17:11:10 2010 -0400 @@ -448,12 +448,8 @@ // If active form has changed, save it if (this.active_form_has_changes) { this.has_changes = true; - // Get annotation and add to form. - var annotation = $("textarea[name=annotation]").val(); - var tool_form = $("#right-content").find("form"); - tool_form.append( "<input type='hidden' name='annotation' value='"+annotation+"' />" ); // Submit form. - tool_form.submit(); + $("#right-content").find("form").submit(); this.active_form_has_changes = false; } }, diff -r 84386da2a3f3 -r 2bda9c59b992 templates/workflow/editor.mako --- a/templates/workflow/editor.mako Mon Mar 22 16:59:20 2010 -0400 +++ b/templates/workflow/editor.mako Mon Mar 22 17:11:10 2010 -0400 @@ -310,7 +310,22 @@ function show_form_for_tool( text, node ) { $("#edit-attributes").hide(); - $("#right-content").show().html( text ); + $("#right-content").show().html( text ); + + // Add metadata form to tool. + if (node) { + $("#right-content").find(".toolForm").after( "<p><div class='metadataForm'> \ + <div class='metadataFormTitle'>Edit Step Attributes</div> \ + <div class='form-row'> \ + <label>Annotation / Notes:</label> \ + <div style='margin-right: 10px;'> \ + <textarea name='annotation' rows='3' style='width: 100%'>" + node.annotation + "</textarea> \ + <div class='toolParamHelp'>Add an annotation or notes to this step; annotations are available when a workflow is viewed.</div> \ + </div> \ + </div> \ + </div>" ); + } + $("#right-content").find( "form" ).ajaxForm( { type: 'POST', dataType: 'json', @@ -352,28 +367,6 @@ }); }); }); - - - // Add metadata form to tool. - if (node) { - var metadata_div = - $( "<p><div class='metadataForm'> \ - <div class='metadataFormTitle'>Edit Step Attributes</div> \ - <div class='form-row'> \ - <label>Annotation / Notes:</label> \ - <div style='margin-right: 10px;'> \ - <textarea name='annotation' rows='3' style='width: 100%'>" + node.annotation + "</textarea> \ - <div class='toolParamHelp'>Add an annotation or notes to this step; annotations are available when a workflow is viewed.</div> \ - </div> \ - </div> \ - </div>"); - // See above comment: this is necessary to handle autosaving. - var textarea = $(metadata_div).find("textarea"); - textarea.focus( function () { - workflow.active_form_has_changes = true; - }); - $("#right-content").find(".toolForm").after( metadata_div ); - } } var close_editor = function() { diff -r 84386da2a3f3 -r 2bda9c59b992 templates/workflow/editor_tool_form.mako --- a/templates/workflow/editor_tool_form.mako Mon Mar 22 16:59:20 2010 -0400 +++ b/templates/workflow/editor_tool_form.mako Mon Mar 22 17:11:10 2010 -0400 @@ -94,10 +94,11 @@ </div> </%def> -<div class="toolForm"> - <div class="toolFormTitle">Tool: ${tool.name}</div> - <div class="toolFormBody"> - <form method="post" action="${h.url_for( action='editor_form_post' )}"> +<form method="post" action="${h.url_for( action='editor_form_post' )}"> + + <div class="toolForm"> + <div class="toolFormTitle">Tool: ${tool.name}</div> + <div class="toolFormBody"> <input type="hidden" name="tool_id" value="${tool.id}" /> %for i, inputs in enumerate( tool.inputs_by_page ): %if tool.has_multiple_pages: @@ -105,6 +106,8 @@ %endif ${do_inputs( inputs, values, errors, "" )} %endfor - </form> + </div> </div> -</div> + + +</form> \ No newline at end of file

1 0

[hg] galaxy 3551: Can customize main logo link url, rename viz l...
by Greg Von Kuster 24 Mar '10

24 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/84386da2a3f3 changeset: 3551:84386da2a3f3 user: Kanwei Li <kanwei(a)gmail.com> date: Mon Mar 22 16:59:20 2010 -0400 description: Can customize main logo link url, rename viz links diffstat: templates/base_panels.mako | 8 ++++---- universe_wsgi.ini.sample | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diffs (45 lines): diff -r 8938319bf173 -r 84386da2a3f3 templates/base_panels.mako --- a/templates/base_panels.mako Mon Mar 22 12:32:14 2010 -0400 +++ b/templates/base_panels.mako Mon Mar 22 16:59:20 2010 -0400 @@ -205,9 +205,9 @@ Visualization <div class="submenu"> <ul> - <li><a href="${h.url_for( controller='/tracks', action='index' )}">Build track browser</a></li> + <li><a href="${h.url_for( controller='/tracks', action='index' )}">New Track Browser</a></li> <li><hr style="color: inherit; background-color: gray"/></li> - <li><a href="${h.url_for( controller='/visualization', action='list' )}">Stored visualizations</a></li> + <li><a href="${h.url_for( controller='/visualization', action='list' )}">Saved Visualizations</a></li> </ul> </div> </td> @@ -287,11 +287,11 @@ ## Logo, layered over tabs to be clickable <div class="title" style="position: absolute; top: 0; left: 0;"> - <a href="/"> + <a href="${app.config.get( 'logo_url', '/' )}"> <img border="0" src="${h.url_for('/static/images/galaxyIcon_noText.png')}" style="width: 26px; vertical-align: top;"> Galaxy %if app.config.brand: - <span class='brand'>/${app.config.brand}</span> + <span class='brand'>/ ${app.config.brand}</span> %endif </a> </div> diff -r 8938319bf173 -r 84386da2a3f3 universe_wsgi.ini.sample --- a/universe_wsgi.ini.sample Mon Mar 22 12:32:14 2010 -0400 +++ b/universe_wsgi.ini.sample Mon Mar 22 16:59:20 2010 -0400 @@ -126,10 +126,12 @@ ## for a local mirror where you are doing private software development ## ## Brand: appends "/[brand]" to the "Galaxy" text in the masthead +## logo_url: replaces the default "Galaxy + brand" link url ## wiki_url: replaces the default galaxy main wiki ## bugs_email: replaces the default galaxy bugs email list ##citation_url: point to a URL listing citations #brand = Private local mirror +#logo_url = / #wiki_url = /path/to/my/local/wiki #bugs_email = mailto:galaxy-bugs@example.org #citation_url = /path/to/my/citations

1 0

[hg] galaxy 3550: Assume plink is on the executing node path for...
by Greg Von Kuster 24 Mar '10

24 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/8938319bf173 changeset: 3550:8938319bf173 user: fubar: ross Lazarus at gmail period com date: Mon Mar 22 12:32:14 2010 -0400 description: Assume plink is on the executing node path for converters Add a non-specific exception catcher to archive creation code in library_common diffstat: lib/galaxy/datatypes/converters/lped_to_pbed_converter.xml | 2 +- lib/galaxy/datatypes/converters/pbed_to_lped_converter.xml | 2 +- lib/galaxy/datatypes/genetics.py | 5 ++++- lib/galaxy/web/controllers/dataset.py | 2 +- lib/galaxy/web/controllers/library_common.py | 5 +++++ 5 files changed, 12 insertions(+), 4 deletions(-) diffs (66 lines): diff -r 7120c4848270 -r 8938319bf173 lib/galaxy/datatypes/converters/lped_to_pbed_converter.xml --- a/lib/galaxy/datatypes/converters/lped_to_pbed_converter.xml Mon Mar 22 11:06:40 2010 -0400 +++ b/lib/galaxy/datatypes/converters/lped_to_pbed_converter.xml Mon Mar 22 12:32:14 2010 -0400 @@ -3,7 +3,7 @@  <command interpreter="python"> lped_to_pbed_converter.py '$input1.extra_files_path/$input1.metadata.base_name' - '$output1' '$output1.files_path' '${GALAXY_DATA_INDEX_DIR}/rg/bin/plink' + '$output1' '$output1.files_path' 'plink' </command> <inputs> <param format="lped" name="input1" type="data" label="Choose linkage pedigree file"/> diff -r 7120c4848270 -r 8938319bf173 lib/galaxy/datatypes/converters/pbed_to_lped_converter.xml --- a/lib/galaxy/datatypes/converters/pbed_to_lped_converter.xml Mon Mar 22 11:06:40 2010 -0400 +++ b/lib/galaxy/datatypes/converters/pbed_to_lped_converter.xml Mon Mar 22 12:32:14 2010 -0400 @@ -3,7 +3,7 @@  <command interpreter="python"> pbed_to_lped_converter.py '$input1.extra_files_path/$input1.metadata.base_name' - '$output1' '$output1.files_path' '${GALAXY_DATA_INDEX_DIR}/rg/bin/plink' + '$output1' '$output1.files_path' 'plink' </command> <inputs> <param format="pbed" name="input1" type="data" label="Choose compressed Plink binary format genotype file"/> diff -r 7120c4848270 -r 8938319bf173 lib/galaxy/datatypes/genetics.py --- a/lib/galaxy/datatypes/genetics.py Mon Mar 22 11:06:40 2010 -0400 +++ b/lib/galaxy/datatypes/genetics.py Mon Mar 22 12:32:14 2010 -0400 @@ -114,7 +114,10 @@ npeek = 5 out = ['<table cellspacing="0" cellpadding="3">'] f = open(dataset.file_name,'r') - d = [f.next() for x in range(npeek)] + d = f.readlines()[:5] + if len(d) == 0: + out = "Cannot find anything to parse in %s" % dataset.name + return out hasheader = 0 try: test = ['%f' % x for x in d[0][1:]] # first is name - see if starts all numerics diff -r 7120c4848270 -r 8938319bf173 lib/galaxy/web/controllers/dataset.py --- a/lib/galaxy/web/controllers/dataset.py Mon Mar 22 11:06:40 2010 -0400 +++ b/lib/galaxy/web/controllers/dataset.py Mon Mar 22 12:32:14 2010 -0400 @@ -332,7 +332,7 @@ trans.response.set_content_type( mime ) return open( file_path ) else: - return "Could not find '%s' on the extra files path." % filename + return "Could not find '%s' on the extra files path %s." % (filename,file_path) mime = trans.app.datatypes_registry.get_mimetype_by_extension( data.extension.lower() ) trans.response.set_content_type(mime) diff -r 7120c4848270 -r 8938319bf173 lib/galaxy/web/controllers/library_common.py --- a/lib/galaxy/web/controllers/library_common.py Mon Mar 22 11:06:40 2010 -0400 +++ b/lib/galaxy/web/controllers/library_common.py Mon Mar 22 12:32:14 2010 -0400 @@ -1334,6 +1334,11 @@ log.exception( "Unable to create archive for download" ) msg = "Unable to create archive for download, please report this error" messagetype = 'error' + except: + error = True + log.exception( "Unexpected error %s in create archive for download" % sys.exc_info()[0]) + msg = "Unable to create archive for download, please report - %s" % sys.exc_info()[0] + messagetype = 'error' if not error: composite_extensions = trans.app.datatypes_registry.get_composite_extensions( ) seen = []

1 0

[hg] galaxy 3549: Make boxplot tool respect exit codes when dete...
by Greg Von Kuster 24 Mar '10

24 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/7120c4848270 changeset: 3549:7120c4848270 user: Dan Blankenberg <dan(a)bx.psu.edu> date: Mon Mar 22 11:06:40 2010 -0400 description: Make boxplot tool respect exit codes when determining job errors: makes e.g. 'Could not find/open font when opening font "arial", using internal non-scalable font' a non-fatal warning. Add version attribute to gnuplot requirement tag. diffstat: tools/plotting/boxplot.xml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (22 lines): diff -r ff39f033ce68 -r 7120c4848270 tools/plotting/boxplot.xml --- a/tools/plotting/boxplot.xml Fri Mar 19 15:09:13 2010 -0400 +++ b/tools/plotting/boxplot.xml Mon Mar 22 11:06:40 2010 -0400 @@ -1,8 +1,8 @@ <tool id="qual_stats_boxplot" name="Boxplot" version="1.0.0"> <description>of quality statistics</description> - <command>gnuplot < '$gnuplot_commands' > '$output_file'</command> + <command>gnuplot < '$gnuplot_commands' 2>&1 || echo "Error running gnuplot." >&2</command> <requirements> - <requirement type="binary">gnuplot</requirement> + <requirement type="binary" version="gnuplot 4.2 patchlevel 2">gnuplot</requirement> </requirements> <inputs> <param name="input_file" type="data" format="tabular" label="Quality Statistics File"/> @@ -30,6 +30,7 @@ </inputs> <configfiles> <configfile name="gnuplot_commands"> +set output '$output_file' set term png size ${graph_size} set boxwidth 0.8 set key right tmargin

1 0

[hg] galaxy 3548: lims: fixed the search bug on the requests grid
by Greg Von Kuster 24 Mar '10

24 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/ff39f033ce68 changeset: 3548:ff39f033ce68 user: rc date: Fri Mar 19 15:09:13 2010 -0400 description: lims: fixed the search bug on the requests grid diffstat: lib/galaxy/web/controllers/requests.py | 2 +- lib/galaxy/web/controllers/requests_admin.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 49a7de2c4707 -r ff39f033ce68 lib/galaxy/web/controllers/requests.py --- a/lib/galaxy/web/controllers/requests.py Thu Mar 18 22:41:15 2010 -0400 +++ b/lib/galaxy/web/controllers/requests.py Fri Mar 19 15:09:13 2010 -0400 @@ -107,7 +107,7 @@ link=( lambda item: iff( item.deleted, None, dict( operation="events", id=item.id ) ) ) ) ] columns.append( grids.MulticolFilterColumn( "Search", - cols_to_filter=[ columns[0], columns[1], columns[6] ], + cols_to_filter=[ columns[0], columns[1] ], key="free-text-search", visible=False, filterable="standard" ) ) diff -r 49a7de2c4707 -r ff39f033ce68 lib/galaxy/web/controllers/requests_admin.py --- a/lib/galaxy/web/controllers/requests_admin.py Thu Mar 18 22:41:15 2010 -0400 +++ b/lib/galaxy/web/controllers/requests_admin.py Fri Mar 19 15:09:13 2010 -0400 @@ -124,7 +124,7 @@ ] columns.append( grids.MulticolFilterColumn( "Search", - cols_to_filter=[ columns[0], columns[1], columns[6] ], + cols_to_filter=[ columns[0], columns[1] ], key="free-text-search", visible=False, filterable="standard" ) )

1 0

[hg] galaxy 3547: Fix tag filtering bug for published item grids.
by Greg Von Kuster 24 Mar '10

24 Mar '10

details: http://www.bx.psu.edu/hg/galaxy/rev/49a7de2c4707 changeset: 3547:49a7de2c4707 user: jeremy goecks <jeremy.goecks(a)emory.edu> date: Thu Mar 18 22:41:15 2010 -0400 description: Fix tag filtering bug for published item grids. diffstat: templates/display_base.mako | 2 +- templates/grid_base.mako | 2 +- templates/history/view.mako | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diffs (36 lines): diff -r be396d94ca5a -r 49a7de2c4707 templates/display_base.mako --- a/templates/display_base.mako Thu Mar 18 16:02:09 2010 -0400 +++ b/templates/display_base.mako Thu Mar 18 22:41:15 2010 -0400 @@ -43,7 +43,7 @@ <% controller_name = get_controller_name( item ) %> var href = '${h.url_for ( controller='/' + controller_name , action='list_published')}'; href = href + "?f-tags=" + tag_name; - if (tag_value != null && tag_value != "") + if (tag_value != undefined && tag_value != "") href = href + ":" + tag_value; self.location = href; } diff -r be396d94ca5a -r 49a7de2c4707 templates/grid_base.mako --- a/templates/grid_base.mako Thu Mar 18 16:02:09 2010 -0400 +++ b/templates/grid_base.mako Thu Mar 18 22:41:15 2010 -0400 @@ -345,7 +345,7 @@ // 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 : ""); + var tag = tag_name + (tag_value !== undefined && tag_value != "" ? ":" + tag_value : ""); $('#more-search-options').show('fast'); add_filter_condition("tags", tag, true); } diff -r be396d94ca5a -r 49a7de2c4707 templates/history/view.mako --- a/templates/history/view.mako Thu Mar 18 16:02:09 2010 -0400 +++ b/templates/history/view.mako Thu Mar 18 22:41:15 2010 -0400 @@ -258,7 +258,7 @@ { var href = '${h.url_for( controller='/history', action='list_published')}'; href = href + "?f-tags=" + tag_name; - if (tag_value != null && tag_value != "") + if (tag_value != undefined && tag_value != "") href = href + ":" + tag_value; self.location = href; }

1 0