Merge stuff

manage.py

@@ -83,20 +83,19 @@ def drop_tables():
 @users_manager.option('--admin', dest='is_admin', action="store_true", default=False, help="set user as admin")
 @users_manager.option('--google', dest='google_auth', action="store_true", default=False, help="user uses Google Auth to login")
 @users_manager.option('--password', dest='password', default=None, help="Password for users who don't use Google Auth (leave blank for prompt).")
-@users_manager.option('--groups', dest='groups', default=['default'], help="Comma seperated list of groups (leave blank for default).")
-def create(email, name, groups, is_admin=False, google_auth=False, password=None):
+@users_manager.option('--permissions', dest='permissions', default=models.User.DEFAULT_PERMISSIONS, help="Comma seperated list of permissions (leave blank for default).")
+def create(email, name, permissions, is_admin=False, google_auth=False, password=None):
     print "Creating user (%s, %s)..." % (email, name)
     print "Admin: %r" % is_admin
     print "Login with Google Auth: %r\n" % google_auth
-    if isinstance(groups, basestring) and len(groups) > 0:
-        groups = groups.split(',')
-    else:
-        groups = ['default']
+    if isinstance(permissions, basestring):
+        permissions = permissions.split(',')
+        permissions.remove('') # in case it was empty string
 
     if is_admin:
-        groups += ['admin']
+        permissions += ['admin']
 
-    user = models.User(email=email, name=name, groups=groups)
+    user = models.User(email=email, name=name, permissions=permissions)
     if not google_auth:
         password = password or prompt_pass("Password")
         user.hash_password(password)

rd_ui/app/scripts/controllers/query_source.js

@@ -20,6 +20,9 @@
             if ($scope.canEdit) {
               $scope.saveQuery();
             }
+          },
+          'meta+enter': function () {
+            $scope.executeQuery();
           }
         };
 

rd_ui/app/scripts/visualizations/cohort.js

@@ -22,7 +22,7 @@
                     if (!data) {
                         return;
                     }
-                    
+
                     if ($scope.queryResult.getData() == null) {
 
                     } else {
@@ -40,7 +40,7 @@
 
                         var initialDate = moment(sortedData[0].date).toDate(),
                             container = angular.element(element)[0];
-                        
+
                         Cornelius.draw({
                             initialDate: initialDate,
                             container: container,

requirements.txt

@@ -26,4 +26,4 @@ wtf-peewee==0.2.2
 Flask-Script==0.6.6
 honcho==0.5.0
 statsd==2.1.2
-gunicorn==18.0
+gunicorn==18.0