Merge branch 'master' into star

endpoints/api/user.py

@@ -73,6 +73,7 @@ def user_view(user):
       'can_create_repo': True,
       'invoice_email': user.invoice_email,
       'preferred_namespace': not (user.stripe_id is None),
+      'tag_expiration': user.removed_tag_expiration_s,
     })
 
   if features.SUPER_USERS:
@@ -144,6 +145,11 @@ class User(ApiResource):
           'type': 'string',
           'description': 'The user\'s email address',
         },
+        'tag_expiration': {
+          'type': 'integer',
+          'maximum': 2592000,
+          'minimum': 0,
+        },
         'username': {
           'type': 'string',
           'description': 'The user\'s username',
@@ -227,6 +233,10 @@ class User(ApiResource):
         logger.debug('Changing invoice_email for user: %s', user.username)
         model.change_invoice_email(user, user_data['invoice_email'])
 
+      if 'tag_expiration' in user_data:
+        logger.debug('Changing user tag expiration to: %ss', user_data['tag_expiration'])
+        model.change_user_tag_expiration(user, user_data['tag_expiration'])
+
       if 'email' in user_data and user_data['email'] != user.email:
         new_email = user_data['email']
         if model.find_user_by_email(new_email):
@@ -248,7 +258,8 @@ class User(ApiResource):
           # Username already used
           raise request_error(message='Username is already in use')
 
-        model.change_username(user, new_username)
+        model.change_username(user.id, new_username)
+
     except model.InvalidPasswordException, ex:
       raise request_error(exception=ex)