~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/admin/user.py

Merge from object-publishing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
from ivle.webapp.base.rest import JSONRESTView, require_permission
21
21
from ivle.webapp.base.xhtml import XHTMLView
22
22
from ivle.webapp.base.plugins import ViewPlugin, MediaPlugin
23
 
from ivle.webapp.admin.traversal import root_to_user, user_url
 
23
from ivle.webapp.admin.publishing import root_to_user, user_url
24
24
import ivle.database
25
25
import ivle.util
26
26