opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3760 from dannon/nametag_fixes

Browse Source 
Tagging tweaks
This commit is contained in:
John Chilton
2017-03-20 08:52:00 -04:00
committed by GitHub
parent 031ce23073 72b3b85962
commit 8e77fe93b8
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/managers/tags.py
+8 -5
View File
@@ -131,7 +131,9 @@ class TagManager( object ):
lc_name = name.lower()
# Get or create item-tag association.
item_tag_assoc = self._get_item_tag_assoc( user, item, lc_name )
if not item_tag_assoc:
# If the association does not exist, or if it has a different value, add another.
# We do allow multiple associations with different values.
if not item_tag_assoc or (item_tag_assoc and item_tag_assoc.value != value):
# Create item-tag association.
# Create tag; if None, skip the tag (and log error).
tag = self._get_or_create_tag( lc_name )
@@ -159,7 +161,7 @@ class TagManager( object ):
# Parse tags.
parsed_tags = self.parse_tags( tags_str )
# Apply each tag.
for name, value in parsed_tags.items():
for name, value in parsed_tags:
self.apply_item_tag( user, item, name, value )
def get_tags_str( self, tags ):
@@ -231,7 +233,7 @@ class TagManager( object ):
def parse_tags( self, tag_str ):
"""
Returns a list of raw (tag-name, value) pairs derived from a string; method scrubs tag names and values as well.
Return value is a dictionary where tag-names are keys.
Return value is a list of (tag_name, tag_value) tuples.
"""
# Gracefully handle None.
if not tag_str:
@@ -240,12 +242,13 @@ class TagManager( object ):
reg_exp = re.compile( '[' + self.tag_separators + ']' )
raw_tags = reg_exp.split( tag_str )
# Extract name-value pairs.
name_value_pairs = dict()
name_value_pairs = []
for raw_tag in raw_tags:
nv_pair = self._get_name_value_pair( raw_tag )
scrubbed_name = self._scrub_tag_name( nv_pair[0] )
scrubbed_value = self._scrub_tag_value( nv_pair[1] )
name_value_pairs[scrubbed_name] = scrubbed_value
# Append tag_name, tag_value tuple -- TODO use NamedTuple
name_value_pairs.append(( scrubbed_name, scrubbed_value ))
return name_value_pairs
def _scrub_tag_value( self, value ):
lib/galaxy/tags/__init__.py
-3
View File
@@ -1,3 +0,0 @@
"""
Galaxy tagging classes and methods.
"""
lib/galaxy/tags/tag_handler.py
View File
lib/galaxy/web/framework/helpers/grids.py
+2 -2
View File
@@ -603,7 +603,7 @@ class CommunityTagsColumn( TextColumn ):
column_filter = ",".join( column_filter )
raw_tags = trans.app.tag_handler.parse_tags( column_filter.encode( "utf-8" ) )
clause_list = []
for name, value in raw_tags.items():
for name, value in raw_tags:
if name:
# Filter by all tags.
clause_list.append( self.model_class.tags.any( func.lower( self.model_tag_association_class.user_tname ).like( "%" + name.lower() + "%" ) ) )
@@ -633,7 +633,7 @@ class IndividualTagsColumn( CommunityTagsColumn ):
column_filter = ",".join( column_filter )
raw_tags = trans.app.tag_handler.parse_tags( column_filter.encode( "utf-8" ) )
clause_list = []
for name, value in raw_tags.items():
for name, value in raw_tags:
if name:
# Filter by individual's tag names.
clause_list.append( self.model_class.tags.any( and_( func.lower( self.model_tag_association_class.user_tname ).like( "%" + name.lower() + "%" ), self.model_tag_association_class.user == user ) ) )