diff --git a/juser/views.py b/juser/views.py index 1646910c5..06ac121a3 100644 --- a/juser/views.py +++ b/juser/views.py @@ -63,7 +63,7 @@ def group_list(request): if keyword: user_group_list = user_group_list.filter(Q(name__icontains=keyword) | Q(comment__icontains=keyword)) - if id: + if group_id: user_group_list = user_group_list.filter(id=int(group_id)) user_group_list, p, user_groups, page_range, current_page, show_first, show_end = pages(user_group_list, request) diff --git a/run_websocket.py b/run_websocket.py index b3bcffac8..75d9b3c7d 100644 --- a/run_websocket.py +++ b/run_websocket.py @@ -116,25 +116,6 @@ def file_monitor(path='.', client=None): break -class Application(tornado.web.Application): - def __init__(self): - handlers = [ - (r'/monitor', MonitorHandler), - (r'/terminal', WebTerminalHandler), - (r'/kill', WebTerminalKillHandler), - (r'/exec', ExecHandler), - ] - - setting = { - 'cookie_secret': 'DFksdfsasdfkasdfFKwlwfsdfsa1204mx', - 'template_path': os.path.join(os.path.dirname(__file__), 'templates'), - 'static_path': os.path.join(os.path.dirname(__file__), 'static'), - 'debug': True, - } - - tornado.web.Application.__init__(self, handlers, **setting) - - class MonitorHandler(tornado.websocket.WebSocketHandler): clients = [] threads = [] @@ -415,12 +396,32 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler): except IndexError: pass + +class Application(tornado.web.Application): + def __init__(self): + handlers = [ + (r'/monitor', MonitorHandler), + (r'/terminal', WebTerminalHandler), + (r'/kill', WebTerminalKillHandler), + (r'/exec', ExecHandler), + ] + + setting = { + 'cookie_secret': 'DFksdfsasdfkasdfFKwlwfsdfsa1204mx', + 'template_path': os.path.join(os.path.dirname(__file__), 'templates'), + 'static_path': os.path.join(os.path.dirname(__file__), 'static'), + 'debug': False, + } + + tornado.web.Application.__init__(self, handlers, **setting) + + if __name__ == '__main__': tornado.options.parse_command_line() app = Application() server = tornado.httpserver.HTTPServer(app) server.bind(options.port, options.host) - # server.listen(options.port) - server.start(num_processes=1) + #server.listen(options.port) + server.start(num_processes=10) print "Run server on %s:%s" % (options.host, options.port) tornado.ioloop.IOLoop.instance().start() diff --git a/templates/jperm/perm_role_detail.html b/templates/jperm/perm_role_detail.html index 606fd707d..6aa91d0ff 100644 --- a/templates/jperm/perm_role_detail.html +++ b/templates/jperm/perm_role_detail.html @@ -144,7 +144,6 @@ {% endfor %} </table> </td> - </tr> </table> </div>