Skip to content
Permalink
Browse files
Fix for #7924.
AS filters weren't being correctly treated as lists. Now they are.
  • Loading branch information
Chris Wacek committed Jan 11, 2013
1 parent 9e9e9db commit 8c2259c944f8e737a7728c74e9e5dcd3e8534bf2
Showing with 13 additions and 7 deletions.
  1. +3 −3 app.py
  2. +3 −3 templates/index.html
  3. +7 −1 util.py
6 app.py
@@ -1,7 +1,7 @@
import os
import re
import compass
from util import Result,Boolean,NullFn,Int,Container,ResultEncoder
from util import Result,Boolean,NullFn,Int,List,ResultEncoder,JSON
import json
from flask import Flask, request, jsonify, render_template,Response

@@ -19,8 +19,8 @@ class Opt(object):
'sort_reverse':Boolean,
'top':Int,
'family':NullFn,
'ases':NullFn,
'country':Container,
'ases':List,
'country':JSON,
'exit_filter':NullFn
}

@@ -285,9 +285,9 @@ <h3> Display </h3>
<script src="static/js/jquery-1.8.0.min.js"></script>
<script src="static/js/bootstrap.min.js"></script>
<script src="static/js/bootstrap-tooltip.js"></script>
<script src="static/lib/select2/select2.js" type="text/javascript"></script>
<script src="static/js/angular/angular.js"> </script>
<script src="static/lib/angular-ui/angular-ui.js"></script>
<script src="static/lib/select2/select2.min.js" type="text/javascript"></script>
<script src="static/js/angular/angular.min.js"> </script>
<script src="static/lib/angular-ui/angular-ui.min.js"></script>
<script src="static/js/directives.js"></script>
<script src="static/js/filters.js"></script>
<script src="static/js/angularize.js"></script>
@@ -1,11 +1,17 @@
import json
import shlex

def Container(val):
def JSON(val):
try:
return json.loads(val)
except ValueError:
return []

def List(val):
lex = shlex.shlex(val)
lex.whitespace += "[],"
return list(lex)

def NullFn(val):
return val

0 comments on commit 8c2259c

Please sign in to comment.