moved storage to qommon/
This commit is contained in:
parent
966d03bbe8
commit
a98c3ec0fd
|
|
@ -5,7 +5,6 @@ from menu import *
|
|||
|
||||
from qommon import misc
|
||||
from wcs.categories import Category
|
||||
import storage
|
||||
from qommon.form import *
|
||||
|
||||
class CategoryUI:
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ from qommon import errors
|
|||
from qommon import misc, get_cfg
|
||||
from wcs.users import User
|
||||
from wcs.roles import Role
|
||||
from wcs import storage
|
||||
import ident
|
||||
|
||||
from qommon.form import *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
|
||||
class AnonymityLink(StorableObject):
|
||||
_names = 'anonylinks'
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ from quixote.html import htmltext
|
|||
|
||||
from qommon import get_cfg
|
||||
|
||||
from wcs import storage
|
||||
from wcs.users import User
|
||||
|
||||
items = [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
|
||||
class Bounce(StorableObject):
|
||||
_names = 'bounces'
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
from qommon.misc import simplify
|
||||
|
||||
class Category(StorableObject):
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import urllib
|
|||
|
||||
from quixote import get_request
|
||||
|
||||
from storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
import time
|
||||
|
||||
from anonylink import AnonymityLink
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
from quixote import get_request, get_session
|
||||
|
||||
import emails
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ from quixote.util import randbytes
|
|||
|
||||
from qommon import errors, get_cfg
|
||||
from wcs import formdata
|
||||
from wcs import storage
|
||||
from qommon import misc, get_logger
|
||||
from qommon import template
|
||||
from qommon.form import *
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from wcs.storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
|
||||
from wcs import users
|
||||
|
||||
|
|
|
|||
|
|
@ -12,6 +12,8 @@ from qommon.publisher import QommonPublisher
|
|||
from root import RootDirectory
|
||||
import sessions
|
||||
|
||||
from users import User
|
||||
|
||||
class WcsPublisher(QommonPublisher):
|
||||
APP_NAME = 'wcs'
|
||||
APP_DIR = APP_DIR
|
||||
|
|
@ -21,6 +23,7 @@ class WcsPublisher(QommonPublisher):
|
|||
|
||||
root_directory_class = RootDirectory
|
||||
session_manager_class = sessions.StorageSessionManager
|
||||
user_class = User
|
||||
|
||||
WcsPublisher.register_extra_dir(os.path.join(os.path.dirname(__file__), 'extra'))
|
||||
|
||||
|
|
|
|||
|
|
@ -4,9 +4,6 @@ import os
|
|||
from quixote import get_session, get_request, get_response, get_publisher
|
||||
import ezt
|
||||
|
||||
from users import User
|
||||
|
||||
|
||||
DEFAULT_TEMPLATE_EZT = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
@ -140,7 +137,7 @@ def decorate(body, response):
|
|||
session = get_session()
|
||||
if session and session.user and not str(session.user).startswith(str('anonymous-')):
|
||||
try:
|
||||
user = User.get(session.user)
|
||||
user = get_publisher().user_class.get(session.user)
|
||||
except (KeyError, ValueError):
|
||||
pass
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
|
||||
class Role(StorableObject):
|
||||
_names = 'roles'
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ from quixote.session import Session, SessionManager
|
|||
from quixote.html import htmltext
|
||||
import users
|
||||
|
||||
from storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
import random
|
||||
|
||||
class BasicSession(Session, StorableObject):
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import random
|
||||
import string
|
||||
|
||||
from storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
import time
|
||||
|
||||
class Token(StorableObject):
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import os
|
|||
|
||||
from quixote import get_publisher
|
||||
|
||||
from storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
|
||||
class User(StorableObject):
|
||||
_names = 'users'
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ from cStringIO import StringIO
|
|||
|
||||
from quixote import get_request
|
||||
|
||||
from storage import StorableObject
|
||||
from qommon.storage import StorableObject
|
||||
from qommon.form import *
|
||||
import emails
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue