Commits

Panayiotis Lipiridis committed 23a0fe0 Merge

Merged with gae-init

Comments (0)

Files changed (3)

 module.exports = (grunt)->
-  path = require("path")
+  path = require('path')
   grunt.initConfig
     watch:
       style:
           targetDir: 'main/static/src/vendor'
           cleanTargetDir: true
           layout: (type, component) ->
-            if type is "fonts"
+            if type is 'fonts'
               path.join '../../vendor-fonts'
             else
               path.join type, component

main/static/src/script/common/service.coffee

   params = params || {}
   for k, v of params
     delete params[k] if not v?
+  separator = if url.search('\\?') >= 0 then '&' else '?'
   $.ajax
     type: method
-    url: "#{url}?#{$.param params}"
+    url: "#{url}#{separator}#{$.param params}"
     contentType: 'application/json'
     accepts: 'application/json'
     dataType: 'json'
       [wtf.validators.optional(), wtf.validators.email()],
       filters=[util.email_filter],
     )
+  admin = wtf.BooleanField('Admin')
+  active = wtf.BooleanField('Active')
   permissions = wtf.SelectMultipleField('Permissions',
       filters=[util.sort_filter],
     )
+
   _permission_choices = set()
-  admin = wtf.BooleanField('Admin')
-  active = wtf.BooleanField('Active')
 
   def __init__(self, *args, **kwds):
     super(UserUpdateForm, self).__init__(*args, **kwds)