Merge pull request #30 from guerler/remove_mako_user_pref_000

Remove unused library, add missing sql component

lib/galaxy/webapps/galaxy/api/users.py

@@ -6,7 +6,7 @@
 import datetime
 import re
 
-from sqlalchemy import false, true, or_
+from sqlalchemy import false, true, and_, or_
 
 from galaxy import exceptions, util, web
 from galaxy.exceptions import MessageException
@@ -318,8 +318,6 @@ def get_information(self, trans, id, **kwd):
             else:
                 inputs.append(dict(id='name_input', name='username', label='Public name:', type='text', value=username, help='Your public name provides a means of identifying you publicly within this tool shed. Public names must be at least three characters in length and contain only lower-case letters, numbers, and the "-" character. You cannot change your public name after you have created a repository in this tool shed.'))
         return {
-            'webapp': trans.webapp.name,
-            'is_admin': trans.user_is_admin(),
             'email': email,
             'username': username,
             'addresses': [address.to_dict(trans) for address in user.addresses],