fix variables in two label upload methods

api/dao/hierarchy.py

@@ -335,9 +335,7 @@ def upsert_bottom_up_hierarchy(metadata, user=None):
         return upsert_top_down_hierarchy(metadata, 'uid', user=user)
 
 
-def upsert_top_down_hierarchy(metadata, type_, user=None):
-    if type_ is None:
-        type_ = 'label'
+def upsert_top_down_hierarchy(metadata, type_='label', user=None):
     log.debug('I know my type is {}'.format(type_))
     group = metadata['group']
     project = metadata['project']

api/placer.py

@@ -139,7 +139,7 @@ class UIDPlacer(Placer):
         metadata_validator(self.metadata, 'POST')
 
         # If not a superuser request, pass uid of user making the upload request
-        targets = self.create_hierarchy(self.metadata, self.context.get('uid'))
+        targets = self.create_hierarchy(self.metadata, user=self.context.get('uid'))
 
         self.metadata_for_file = {}