File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -38,7 +38,7 @@ linterrors3: docker
3838 docker run -i -t -v ` pwd` :/app:rw -w /app pricingassistant/mrq-env python3 -m pylint -j 0 --errors-only --init-hook=" import sys; sys.path.append('.')" --rcfile .pylintrc mrq
3939
4040virtualenv :
41- virtualenv venv --distribute
41+ virtualenv venv --distribute --python=python2.7
4242
4343deps :
4444 pip install -r requirements.txt
Original file line number Diff line number Diff line change @@ -153,11 +153,15 @@ def build_api_datatables_query(req):
153153 for param in ["queue" , "path" , "exceptiontype" ]:
154154 if req .args .get (param ):
155155 if "*" in req .args [param ]:
156- regexp = "^%s$" % re . escape ( req .args [param ]) .replace ("*" , ".*" )
157- query [param ] = re . compile ( regexp )
156+ regexp = "^%s$" % req .args [param ].replace ("*" , ".*" )
157+ query [param ] = { "$regex" : regexp }
158158 else :
159159 query [param ] = req .args [param ]
160160
161+ if req .args .get ("queue" ) and req .args ["queue" ].endswith ("/" ):
162+ subqueues = Queue (req .args ["queue" ]).get_known_subqueues ()
163+ query ["queue" ] = {"$in" : list (subqueues )}
164+
161165 if req .args .get ("status" ):
162166 statuses = req .args ["status" ].split ("-" )
163167 if len (statuses ) == 1 :
You can’t perform that action at this time.
0 commit comments