Show More
@@ -21,10 +21,9 b'' | |||||
21 | import logging |
|
21 | import logging | |
22 |
|
22 | |||
23 | from pyramid.view import view_config |
|
23 | from pyramid.view import view_config | |
24 | from sqlalchemy.orm import joinedload |
|
|||
25 |
|
24 | |||
26 | from rhodecode.apps._base import BaseAppView |
|
25 | from rhodecode.apps._base import BaseAppView | |
27 | from rhodecode.model.db import UserLog |
|
26 | from rhodecode.model.db import joinedload, UserLog | |
28 | from rhodecode.lib.user_log_filter import user_log_filter |
|
27 | from rhodecode.lib.user_log_filter import user_log_filter | |
29 | from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator |
|
28 | from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator | |
30 | from rhodecode.lib.utils2 import safe_int |
|
29 | from rhodecode.lib.utils2 import safe_int |
@@ -20,7 +20,6 b'' | |||||
20 |
|
20 | |||
21 | import logging |
|
21 | import logging | |
22 |
|
22 | |||
23 |
|
||||
24 | from pyramid.httpexceptions import HTTPFound |
|
23 | from pyramid.httpexceptions import HTTPFound | |
25 | from pyramid.view import view_config |
|
24 | from pyramid.view import view_config | |
26 |
|
25 |
@@ -21,7 +21,6 b'' | |||||
21 | import collections |
|
21 | import collections | |
22 | import logging |
|
22 | import logging | |
23 |
|
23 | |||
24 |
|
||||
25 | from pyramid.view import view_config |
|
24 | from pyramid.view import view_config | |
26 |
|
25 | |||
27 | from rhodecode.apps._base import BaseAppView |
|
26 | from rhodecode.apps._base import BaseAppView |
@@ -21,6 +21,7 b'' | |||||
21 | import re |
|
21 | import re | |
22 | import logging |
|
22 | import logging | |
23 | import formencode |
|
23 | import formencode | |
|
24 | import formencode.htmlfill | |||
24 | import datetime |
|
25 | import datetime | |
25 | from pyramid.interfaces import IRoutesMapper |
|
26 | from pyramid.interfaces import IRoutesMapper | |
26 |
|
27 | |||
@@ -37,7 +38,8 b' from rhodecode.lib import helpers as h' | |||||
37 | from rhodecode.lib.auth import ( |
|
38 | from rhodecode.lib.auth import ( | |
38 | LoginRequired, HasPermissionAllDecorator, CSRFRequired) |
|
39 | LoginRequired, HasPermissionAllDecorator, CSRFRequired) | |
39 | from rhodecode.lib.utils2 import aslist, safe_unicode |
|
40 | from rhodecode.lib.utils2 import aslist, safe_unicode | |
40 | from rhodecode.model.db import or_, joinedload, coalesce, User, UserIpMap, UserSshKeys |
|
41 | from rhodecode.model.db import ( | |
|
42 | or_, coalesce, User, UserIpMap, UserSshKeys) | |||
41 | from rhodecode.model.forms import ( |
|
43 | from rhodecode.model.forms import ( | |
42 | ApplicationPermissionsForm, ObjectPermissionsForm, UserPermissionsForm) |
|
44 | ApplicationPermissionsForm, ObjectPermissionsForm, UserPermissionsForm) | |
43 | from rhodecode.model.meta import Session |
|
45 | from rhodecode.model.meta import Session |
@@ -25,7 +25,6 b' from pyramid.view import view_config' | |||||
25 |
|
25 | |||
26 | from rhodecode.apps._base import BaseAppView |
|
26 | from rhodecode.apps._base import BaseAppView | |
27 | from rhodecode.apps.admin.navigation import navigation_list |
|
27 | from rhodecode.apps.admin.navigation import navigation_list | |
28 | from rhodecode.lib import helpers as h |
|
|||
29 | from rhodecode.lib.auth import ( |
|
28 | from rhodecode.lib.auth import ( | |
30 | LoginRequired, HasPermissionAllDecorator, CSRFRequired) |
|
29 | LoginRequired, HasPermissionAllDecorator, CSRFRequired) | |
31 | from rhodecode.lib.utils2 import safe_int |
|
30 | from rhodecode.lib.utils2 import safe_int |
@@ -20,6 +20,7 b'' | |||||
20 |
|
20 | |||
21 | import logging |
|
21 | import logging | |
22 | import formencode |
|
22 | import formencode | |
|
23 | import formencode.htmlfill | |||
23 |
|
24 | |||
24 | from pyramid.httpexceptions import HTTPFound, HTTPForbidden |
|
25 | from pyramid.httpexceptions import HTTPFound, HTTPForbidden | |
25 | from pyramid.view import view_config |
|
26 | from pyramid.view import view_config |
@@ -21,6 +21,7 b'' | |||||
21 | import logging |
|
21 | import logging | |
22 | import datetime |
|
22 | import datetime | |
23 | import formencode |
|
23 | import formencode | |
|
24 | import formencode.htmlfill | |||
24 |
|
25 | |||
25 | from pyramid.httpexceptions import HTTPFound |
|
26 | from pyramid.httpexceptions import HTTPFound | |
26 | from pyramid.view import view_config |
|
27 | from pyramid.view import view_config |
@@ -22,6 +22,7 b' import time' | |||||
22 | import logging |
|
22 | import logging | |
23 |
|
23 | |||
24 | import formencode |
|
24 | import formencode | |
|
25 | import formencode.htmlfill | |||
25 | import peppercorn |
|
26 | import peppercorn | |
26 |
|
27 | |||
27 | from pyramid.httpexceptions import HTTPNotFound, HTTPForbidden, HTTPFound |
|
28 | from pyramid.httpexceptions import HTTPNotFound, HTTPForbidden, HTTPFound |
General Comments 0
You need to be logged in to leave comments.
Login now