misc: use relative imports (#36518)
This commit is contained in:
parent
568b59b447
commit
3e037e2e95
|
@ -1,25 +1,25 @@
|
|||
from quixote import get_publisher
|
||||
|
||||
from qommon import _
|
||||
from qommon.publisher import get_publisher_class, get_request
|
||||
from qommon.misc import get_cfg
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.publisher import get_publisher_class, get_request
|
||||
from wcs.qommon.misc import get_cfg
|
||||
|
||||
import modules.admin
|
||||
import modules.backoffice
|
||||
import modules.links_ui
|
||||
import modules.announces_ui
|
||||
import modules.categories_admin
|
||||
import modules.events_ui
|
||||
import modules.payments_ui
|
||||
import modules.strongbox_ui
|
||||
import modules.formpage
|
||||
import modules.template
|
||||
import modules.root
|
||||
import modules.payments
|
||||
import modules.connectors
|
||||
import modules.abelium_domino_ui
|
||||
import modules.abelium_domino_vars
|
||||
import modules.abelium_domino_synchro
|
||||
from modules import admin
|
||||
from modules import backoffice
|
||||
from modules import links_ui
|
||||
from modules import announces_ui
|
||||
from modules import categories_admin
|
||||
from modules import events_ui
|
||||
from modules import payments_ui
|
||||
from modules import strongbox_ui
|
||||
from modules import formpage
|
||||
from modules import template
|
||||
from modules import root
|
||||
from modules import payments
|
||||
from modules import connectors
|
||||
from modules import abelium_domino_ui
|
||||
from modules import abelium_domino_vars
|
||||
from modules import abelium_domino_synchro
|
||||
|
||||
get_publisher_class().register_translation_domain('auquotidien')
|
||||
get_publisher_class().default_configuration_path = 'au-quotidien-wcs-settings.xml'
|
||||
|
@ -28,28 +28,28 @@ rdb = get_publisher_class().backoffice_directory_class
|
|||
|
||||
rdb.items = []
|
||||
|
||||
rdb.register_directory('announces', modules.announces_ui.AnnouncesDirectory())
|
||||
rdb.register_directory('announces', announces_ui.AnnouncesDirectory())
|
||||
rdb.register_menu_item('announces/', _('Announces'))
|
||||
|
||||
rdb.register_directory('links', modules.links_ui.LinksDirectory())
|
||||
rdb.register_directory('links', links_ui.LinksDirectory())
|
||||
rdb.register_menu_item('links/', _('Links'))
|
||||
|
||||
rdb.register_directory('events', modules.events_ui.EventsDirectory())
|
||||
rdb.register_directory('events', events_ui.EventsDirectory())
|
||||
rdb.register_menu_item('events/', _('Events'))
|
||||
|
||||
rdb.register_directory('payments', modules.payments_ui.PaymentsDirectory())
|
||||
rdb.register_directory('payments', payments_ui.PaymentsDirectory())
|
||||
rdb.register_menu_item('payments/', _('Payments'))
|
||||
|
||||
rdb.register_directory('strongbox', modules.strongbox_ui.StrongboxDirectory())
|
||||
rdb.register_directory('strongbox', strongbox_ui.StrongboxDirectory())
|
||||
rdb.register_menu_item('strongbox/', _('Strongbox'))
|
||||
|
||||
rdb.register_directory('settings', modules.admin.SettingsDirectory())
|
||||
rdb.register_directory('settings', admin.SettingsDirectory())
|
||||
|
||||
import wcs.admin.forms
|
||||
wcs.admin.forms.FormsDirectory.categories = modules.categories_admin.CategoriesDirectory()
|
||||
wcs.admin.forms.FormsDirectory.categories = categories_admin.CategoriesDirectory()
|
||||
|
||||
import wcs.admin.settings
|
||||
wcs.admin.settings.SettingsDirectory.domino = modules.abelium_domino_ui.AbeliumDominoDirectory()
|
||||
wcs.admin.settings.SettingsDirectory.domino = abelium_domino_ui.AbeliumDominoDirectory()
|
||||
wcs.admin.settings.SettingsDirectory._q_exports.append('domino')
|
||||
|
||||
import wcs.categories
|
||||
|
|
|
@ -3,16 +3,16 @@ from datetime import datetime
|
|||
import collections
|
||||
from decimal import Decimal
|
||||
|
||||
from qommon import _
|
||||
from qommon.cron import CronJob
|
||||
from qommon.publisher import get_publisher_class
|
||||
from qommon import get_logger
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.cron import CronJob
|
||||
from wcs.qommon.publisher import get_publisher_class
|
||||
from wcs.qommon import get_logger
|
||||
|
||||
from wcs.users import User
|
||||
|
||||
from abelium_domino_ui import (get_client, is_activated, get_invoice_regie,
|
||||
from .abelium_domino_ui import (get_client, is_activated, get_invoice_regie,
|
||||
abelium_domino_ws)
|
||||
from payments import Invoice, Transaction
|
||||
from .payments import Invoice, Transaction
|
||||
|
||||
DOMINO_ID_PREFIX = 'DOMINO-'
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@ from quixote import get_publisher, redirect, get_request
|
|||
from quixote.directory import Directory, AccessControlled
|
||||
from quixote.html import TemplateIO, htmltext
|
||||
|
||||
from qommon import _
|
||||
from qommon import get_cfg, get_logger
|
||||
from qommon.form import Form, StringWidget, CheckboxWidget, SingleSelectWidget
|
||||
from qommon.backoffice.menu import html_top
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import get_cfg, get_logger
|
||||
from wcs.qommon.form import Form, StringWidget, CheckboxWidget, SingleSelectWidget
|
||||
from wcs.qommon.backoffice.menu import html_top
|
||||
from quixote.html import htmltext
|
||||
|
||||
from payments import Regie
|
||||
from .payments import Regie
|
||||
|
||||
|
||||
# constants
|
||||
|
|
|
@ -3,11 +3,11 @@ import logging
|
|||
|
||||
from quixote.publish import get_publisher
|
||||
|
||||
from qommon import _
|
||||
from qommon.substitution import Substitutions
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.substitution import Substitutions
|
||||
from wcs.publisher import WcsPublisher
|
||||
|
||||
from abelium_domino_ui import (is_activated, abelium_domino_ws, get_client, get_family)
|
||||
from .abelium_domino_ui import (is_activated, abelium_domino_ws, get_client, get_family)
|
||||
|
||||
SESSION_CACHE = 'abelium_domino_variable_cache'
|
||||
|
||||
|
|
|
@ -4,17 +4,16 @@ import time
|
|||
from quixote import get_request, get_publisher, get_session
|
||||
from quixote.directory import Directory
|
||||
|
||||
from qommon import _
|
||||
from qommon.substitution import Substitutions
|
||||
from qommon.form import Form, ValidatedStringWidget
|
||||
import qommon.misc
|
||||
from qommon import get_logger
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.substitution import Substitutions
|
||||
from wcs.qommon.form import Form, ValidatedStringWidget
|
||||
from wcs.qommon import get_logger
|
||||
|
||||
from wcs.workflows import Workflow, WorkflowStatusJumpItem, register_item_class
|
||||
from wcs.forms.common import FormStatusPage
|
||||
|
||||
from abelium_domino_ui import (is_activated, abelium_domino_ws, get_client, get_family)
|
||||
import abelium_domino_ws
|
||||
from .abelium_domino_ui import (is_activated, abelium_domino_ws, get_client, get_family)
|
||||
from . import abelium_domino_ws
|
||||
|
||||
class InternalCodeStringWidget(ValidatedStringWidget):
|
||||
regex = '\d*'
|
||||
|
|
|
@ -8,18 +8,18 @@ import wcs.admin.root
|
|||
import wcs.root
|
||||
from wcs.roles import get_user_roles
|
||||
|
||||
from qommon import _
|
||||
from qommon import errors, get_cfg
|
||||
from qommon.form import *
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import errors, get_cfg
|
||||
from wcs.qommon.form import *
|
||||
|
||||
import wcs.admin.settings
|
||||
from wcs.formdef import FormDef
|
||||
from wcs.categories import Category
|
||||
from qommon.backoffice.menu import html_top
|
||||
from wcs.qommon.backoffice.menu import html_top
|
||||
|
||||
from events import get_default_event_tags
|
||||
from .events import get_default_event_tags
|
||||
import re
|
||||
from abelium_domino_ui import AbeliumDominoDirectory
|
||||
from .abelium_domino_ui import AbeliumDominoDirectory
|
||||
|
||||
|
||||
class PanelDirectory(Directory):
|
||||
|
@ -288,4 +288,4 @@ class SettingsDirectory(wcs.admin.settings.SettingsDirectory):
|
|||
return PanelDirectory()
|
||||
return super(SettingsDirectory, self)._q_lookup(component)
|
||||
|
||||
import categories_admin
|
||||
from . import categories_admin
|
||||
|
|
|
@ -6,11 +6,11 @@ from quixote.directory import Directory
|
|||
from quixote import get_publisher, get_request, redirect, get_session, get_response
|
||||
from quixote.html import htmltext, TemplateIO
|
||||
|
||||
from qommon import _
|
||||
from qommon import misc, template, errors, get_cfg
|
||||
from qommon.form import *
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import misc, template, errors, get_cfg
|
||||
from wcs.qommon.form import *
|
||||
|
||||
from events import Event, RemoteCalendar, get_default_event_tags
|
||||
from .events import Event, RemoteCalendar, get_default_event_tags
|
||||
|
||||
|
||||
class TagDirectory(Directory):
|
||||
|
|
|
@ -4,15 +4,15 @@ from quixote import get_publisher
|
|||
|
||||
from quixote.html import htmlescape
|
||||
|
||||
from qommon import _
|
||||
from qommon.storage import StorableObject
|
||||
from qommon import get_cfg, get_logger
|
||||
from qommon import errors
|
||||
from qommon import misc
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.storage import StorableObject
|
||||
from wcs.qommon import get_cfg, get_logger
|
||||
from wcs.qommon import errors
|
||||
from wcs.qommon import misc
|
||||
|
||||
from qommon import emails
|
||||
from qommon.sms import SMS
|
||||
from qommon.admin.emails import EmailsDirectory
|
||||
from wcs.qommon import emails
|
||||
from wcs.qommon.sms import SMS
|
||||
from wcs.qommon.admin.emails import EmailsDirectory
|
||||
|
||||
class AnnounceSubscription(StorableObject):
|
||||
_names = 'announce-subscriptions'
|
||||
|
|
|
@ -4,15 +4,15 @@ from quixote.html import htmltext, TemplateIO
|
|||
|
||||
import wcs
|
||||
|
||||
from qommon import _
|
||||
from qommon.backoffice.menu import html_top
|
||||
from qommon.admin.menu import command_icon
|
||||
from qommon import get_cfg
|
||||
from qommon import errors
|
||||
from qommon.form import *
|
||||
from qommon.afterjobs import AfterJob
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.backoffice.menu import html_top
|
||||
from wcs.qommon.admin.menu import command_icon
|
||||
from wcs.qommon import get_cfg
|
||||
from wcs.qommon import errors
|
||||
from wcs.qommon.form import *
|
||||
from wcs.qommon.afterjobs import AfterJob
|
||||
|
||||
from announces import Announce, AnnounceSubscription
|
||||
from .announces import Announce, AnnounceSubscription
|
||||
|
||||
|
||||
class SubscriptionDirectory(Directory):
|
||||
|
|
|
@ -4,16 +4,16 @@ from quixote import get_publisher, redirect
|
|||
from quixote.directory import Directory
|
||||
from quixote.html import TemplateIO, htmltext
|
||||
|
||||
from qommon import _
|
||||
from qommon.publisher import get_publisher_class
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.publisher import get_publisher_class
|
||||
|
||||
import wcs.backoffice.management
|
||||
import wcs.root
|
||||
from wcs.categories import Category
|
||||
from wcs.formdef import FormDef
|
||||
|
||||
from qommon import get_cfg, errors
|
||||
from qommon.form import *
|
||||
from wcs.qommon import get_cfg, errors
|
||||
from wcs.qommon.form import *
|
||||
|
||||
CURRENT_USER = object()
|
||||
|
||||
|
|
|
@ -18,12 +18,12 @@ from quixote import redirect
|
|||
from quixote.directory import Directory
|
||||
from quixote.html import TemplateIO, htmltext
|
||||
|
||||
from qommon import _
|
||||
from qommon import misc
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import misc
|
||||
from wcs.categories import Category
|
||||
from qommon.form import *
|
||||
from qommon.backoffice.menu import html_top
|
||||
from qommon.admin.menu import command_icon, error_page
|
||||
from wcs.qommon.form import *
|
||||
from wcs.qommon.backoffice.menu import html_top
|
||||
from wcs.qommon.admin.menu import command_icon, error_page
|
||||
import wcs.admin.categories
|
||||
|
||||
class CategoryUI:
|
||||
|
|
|
@ -10,10 +10,10 @@ except ImportError:
|
|||
import time
|
||||
import vobject
|
||||
|
||||
from qommon import _
|
||||
from qommon import get_cfg
|
||||
from qommon.misc import format_time
|
||||
from qommon.form import *
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import get_cfg
|
||||
from wcs.qommon.misc import format_time
|
||||
from wcs.qommon.form import *
|
||||
|
||||
from wcs.data_sources import register_data_source_function
|
||||
from wcs.formdata import Evolution
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
import clicrdv
|
||||
import abelium_domino_workflow
|
||||
from . import clicrdv
|
||||
from . import abelium_domino_workflow
|
||||
|
|
|
@ -6,11 +6,11 @@ import vobject
|
|||
from quixote import get_request, get_publisher, get_response
|
||||
from quixote.html import htmltext, TemplateIO, htmlescape
|
||||
|
||||
from qommon import _
|
||||
from qommon.publisher import get_publisher_class
|
||||
from qommon.storage import StorableObject
|
||||
from qommon.cron import CronJob
|
||||
from qommon import misc
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.publisher import get_publisher_class
|
||||
from wcs.qommon.storage import StorableObject
|
||||
from wcs.qommon.cron import CronJob
|
||||
from wcs.qommon import misc
|
||||
|
||||
class Event(StorableObject):
|
||||
_names = 'events'
|
||||
|
|
|
@ -7,15 +7,15 @@ from quixote.html import TemplateIO, htmltext
|
|||
import wcs
|
||||
import wcs.admin.root
|
||||
|
||||
from qommon import _
|
||||
from qommon.backoffice.menu import html_top
|
||||
from qommon.admin.menu import command_icon
|
||||
from qommon import get_cfg
|
||||
from qommon import errors, misc
|
||||
from qommon.form import *
|
||||
from qommon.misc import strftime
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.backoffice.menu import html_top
|
||||
from wcs.qommon.admin.menu import command_icon
|
||||
from wcs.qommon import get_cfg
|
||||
from wcs.qommon import errors, misc
|
||||
from wcs.qommon.form import *
|
||||
from wcs.qommon.misc import strftime
|
||||
|
||||
from events import Event, RemoteCalendar, get_default_event_tags
|
||||
from .events import Event, RemoteCalendar, get_default_event_tags
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -7,13 +7,13 @@ import os
|
|||
import wcs
|
||||
import wcs.forms.root
|
||||
import wcs.forms.preview
|
||||
from qommon import _
|
||||
from qommon import template
|
||||
from qommon import errors
|
||||
from qommon.form import *
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import template
|
||||
from wcs.qommon import errors
|
||||
from wcs.qommon.form import *
|
||||
from wcs.roles import logged_users_role
|
||||
|
||||
from qommon import emails
|
||||
from wcs.qommon import emails
|
||||
|
||||
OldFormPage = wcs.forms.root.FormPage
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
from qommon.storage import StorableObject
|
||||
from wcs.qommon.storage import StorableObject
|
||||
|
||||
class Link(StorableObject):
|
||||
_names = 'links'
|
||||
|
|
|
@ -5,14 +5,14 @@ from quixote.html import TemplateIO, htmltext
|
|||
import wcs
|
||||
import wcs.admin.root
|
||||
|
||||
from qommon import _
|
||||
from qommon import errors
|
||||
from qommon.form import *
|
||||
from qommon.backoffice.menu import html_top
|
||||
from qommon.admin.menu import command_icon
|
||||
from qommon import get_cfg
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import errors
|
||||
from wcs.qommon.form import *
|
||||
from wcs.qommon.backoffice.menu import html_top
|
||||
from wcs.qommon.admin.menu import command_icon
|
||||
from wcs.qommon import get_cfg
|
||||
|
||||
from links import Link
|
||||
from .links import Link
|
||||
|
||||
|
||||
class LinkDirectory(Directory):
|
||||
|
|
|
@ -10,25 +10,24 @@ from quixote.directory import AccessControlled, Directory
|
|||
from quixote.html import TemplateIO, htmltext
|
||||
from quixote.util import StaticFile, FileStream
|
||||
|
||||
from qommon import _
|
||||
from qommon import template
|
||||
from qommon.form import *
|
||||
from qommon import get_cfg, get_logger
|
||||
from qommon import errors
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import template
|
||||
from wcs.qommon.form import *
|
||||
from wcs.qommon import get_cfg, get_logger
|
||||
from wcs.qommon import errors
|
||||
from wcs.api import get_user_from_api_query_string
|
||||
|
||||
import qommon.ident.password
|
||||
from qommon.ident.password_accounts import PasswordAccount
|
||||
import wcs.qommon.ident.password
|
||||
from wcs.qommon.ident.password_accounts import PasswordAccount
|
||||
|
||||
from wcs.qommon.admin.texts import TextsDirectory
|
||||
|
||||
from wcs.formdef import FormDef
|
||||
import wcs.myspace
|
||||
import root
|
||||
|
||||
from announces import AnnounceSubscription
|
||||
from strongbox import StrongboxItem, StrongboxType
|
||||
from payments import Invoice, Regie, is_payment_supported
|
||||
from .announces import AnnounceSubscription
|
||||
from .strongbox import StrongboxItem, StrongboxType
|
||||
from .payments import Invoice, Regie, is_payment_supported
|
||||
|
||||
class MyInvoicesDirectory(Directory):
|
||||
_q_exports = ['']
|
||||
|
@ -506,6 +505,7 @@ class MyspaceDirectory(wcs.myspace.MyspaceDirectory):
|
|||
|
||||
if user_forms:
|
||||
r += htmltext('<h3 id="my-forms">%s</h3>') % _('My Forms')
|
||||
from . import root
|
||||
r += root.FormsRootDirectory().user_forms(user_forms)
|
||||
|
||||
return r.getvalue()
|
||||
|
@ -601,7 +601,7 @@ class MyspaceDirectory(wcs.myspace.MyspaceDirectory):
|
|||
return redirect('.')
|
||||
|
||||
if form.is_submitted() and not form.has_errors():
|
||||
qommon.ident.password.check_password(form, 'new_password')
|
||||
wcs.qommon.ident.password.check_password(form, 'new_password')
|
||||
new_password = form.get_widget('new_password').parse()
|
||||
new2_password = form.get_widget('new2_password').parse()
|
||||
if new_password != new2_password:
|
||||
|
|
|
@ -21,12 +21,12 @@ try:
|
|||
except ImportError:
|
||||
pass
|
||||
|
||||
from qommon import _
|
||||
from qommon import errors, get_logger, get_cfg, emails
|
||||
from qommon.storage import StorableObject
|
||||
from qommon.form import htmltext, StringWidget, TextWidget, SingleSelectWidget, \
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import errors, get_logger, get_cfg, emails
|
||||
from wcs.qommon.storage import StorableObject
|
||||
from wcs.qommon.form import htmltext, StringWidget, TextWidget, SingleSelectWidget, \
|
||||
WidgetDict
|
||||
from qommon.misc import simplify
|
||||
from wcs.qommon.misc import simplify
|
||||
|
||||
from wcs.formdef import FormDef
|
||||
from wcs.formdata import Evolution
|
||||
|
|
|
@ -12,14 +12,14 @@ import wcs
|
|||
import wcs.admin.root
|
||||
from wcs.formdef import FormDef
|
||||
|
||||
from qommon import _
|
||||
from qommon import errors, misc, template, get_logger
|
||||
from qommon.form import *
|
||||
from qommon.admin.emails import EmailsDirectory
|
||||
from qommon.backoffice.menu import html_top
|
||||
from qommon import get_cfg
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import errors, misc, template, get_logger
|
||||
from wcs.qommon.form import *
|
||||
from wcs.qommon.admin.emails import EmailsDirectory
|
||||
from wcs.qommon.backoffice.menu import html_top
|
||||
from wcs.qommon import get_cfg
|
||||
|
||||
from payments import (eopayment, Regie, is_payment_supported, Invoice,
|
||||
from .payments import (eopayment, Regie, is_payment_supported, Invoice,
|
||||
Transaction, notify_paid_invoice)
|
||||
|
||||
from wcs.qommon.admin.texts import TextsDirectory
|
||||
|
|
|
@ -2,6 +2,7 @@ from quixote import get_publisher, get_response, get_request, redirect, get_sess
|
|||
from quixote.directory import Directory
|
||||
from quixote.html import TemplateIO, htmltext
|
||||
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon.misc import get_variadic_url, simplify
|
||||
|
||||
import os
|
||||
|
@ -16,44 +17,43 @@ except ImportError:
|
|||
|
||||
import wcs
|
||||
import wcs.root
|
||||
import qommon
|
||||
from qommon import _
|
||||
from qommon import get_cfg, get_logger
|
||||
from qommon import template
|
||||
from qommon import errors
|
||||
from qommon.form import *
|
||||
from qommon import logger
|
||||
from wcs import qommon
|
||||
from wcs.qommon import get_cfg, get_logger
|
||||
from wcs.qommon import template
|
||||
from wcs.qommon import errors
|
||||
from wcs.qommon.form import *
|
||||
from wcs.qommon import logger
|
||||
from wcs.roles import logged_users_role
|
||||
|
||||
from qommon import emails
|
||||
from qommon.sms import SMS
|
||||
from wcs.qommon import emails
|
||||
from wcs.qommon.sms import SMS
|
||||
from wcs.categories import Category
|
||||
from wcs.formdef import FormDef
|
||||
from wcs.data_sources import NamedDataSource
|
||||
from qommon.tokens import Token
|
||||
from qommon.admin.emails import EmailsDirectory
|
||||
from wcs.qommon.tokens import Token
|
||||
from wcs.qommon.admin.emails import EmailsDirectory
|
||||
from wcs.qommon.admin.texts import TextsDirectory
|
||||
|
||||
from links import Link
|
||||
from announces import Announce, AnnounceSubscription
|
||||
from myspace import MyspaceDirectory
|
||||
from agenda import AgendaDirectory
|
||||
from events import Event, get_default_event_tags
|
||||
from payments import PublicPaymentDirectory
|
||||
from payments_ui import InvoicesDirectory
|
||||
from .links import Link
|
||||
from .announces import Announce, AnnounceSubscription
|
||||
from .myspace import MyspaceDirectory
|
||||
from .agenda import AgendaDirectory
|
||||
from .events import Event, get_default_event_tags
|
||||
from .payments import PublicPaymentDirectory
|
||||
from .payments_ui import InvoicesDirectory
|
||||
|
||||
import admin
|
||||
from . import admin
|
||||
|
||||
import wcs.forms.root
|
||||
from wcs.workflows import Workflow
|
||||
from wcs.forms.preview import PreviewDirectory
|
||||
|
||||
from saml2 import Saml2Directory
|
||||
from .saml2 import Saml2Directory
|
||||
|
||||
OldRootDirectory = wcs.root.RootDirectory
|
||||
|
||||
import qommon.ident.password
|
||||
import qommon.ident.idp
|
||||
import wcs.qommon.ident.password
|
||||
import wcs.qommon.ident.idp
|
||||
|
||||
|
||||
def category_get_homepage_position(self):
|
||||
|
@ -646,7 +646,7 @@ class AlternateRegisterDirectory(OldRegisterDirectory):
|
|||
else:
|
||||
method = 'password'
|
||||
|
||||
return qommon.ident.register(method)
|
||||
return wcs.qommon.ident.register(method)
|
||||
|
||||
OldLoginDirectory = wcs.root.LoginDirectory
|
||||
|
||||
|
@ -685,7 +685,7 @@ class AlternateLoginDirectory(OldLoginDirectory):
|
|||
if len(ident_methods) == 1:
|
||||
method = ident_methods[0]
|
||||
try:
|
||||
return qommon.ident.login(method)
|
||||
return wcs.qommon.ident.login(method)
|
||||
except KeyError:
|
||||
get_logger().error('failed to login with method %s' % method)
|
||||
return errors.TraversalError()
|
||||
|
@ -702,7 +702,7 @@ class AlternateLoginDirectory(OldLoginDirectory):
|
|||
form.add(PasswordWidget, 'password', title = _('Password'), size=25, required=True)
|
||||
form.add_submit('submit', _('Connect'))
|
||||
if form.is_submitted() and not form.has_errors():
|
||||
tmp = qommon.ident.password.MethodDirectory().login_submit(form)
|
||||
tmp = wcs.qommon.ident.password.MethodDirectory().login_submit(form)
|
||||
if not form.has_errors():
|
||||
return tmp
|
||||
|
||||
|
|
|
@ -3,11 +3,11 @@ try:
|
|||
except ImportError:
|
||||
pass
|
||||
|
||||
from qommon import get_cfg, get_logger
|
||||
import qommon.saml2
|
||||
from wcs.qommon import get_cfg, get_logger
|
||||
import wcs.qommon.saml2
|
||||
|
||||
|
||||
class Saml2Directory(qommon.saml2.Saml2Directory):
|
||||
class Saml2Directory(wcs.qommon.saml2.Saml2Directory):
|
||||
def extract_attributes(self, session, login):
|
||||
'''Separate attributes as two dictionaries: one for last value, one for
|
||||
the list of values.'''
|
||||
|
@ -35,9 +35,9 @@ class Saml2Directory(qommon.saml2.Saml2Directory):
|
|||
return d, m
|
||||
|
||||
def fill_user_attributes(self, session, login, user):
|
||||
qommon.saml2.Saml2Directory.fill_user_attributes(self, session, login, user)
|
||||
wcs.qommon.saml2.Saml2Directory.fill_user_attributes(self, session, login, user)
|
||||
|
||||
idp = qommon.saml2.get_remote_provider_cfg(login)
|
||||
idp = wcs.qommon.saml2.get_remote_provider_cfg(login)
|
||||
if not idp.get('attribute-mapping'):
|
||||
self.legacy_fill_user_attributes(session, login, user)
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@ import os
|
|||
import time
|
||||
|
||||
from quixote import get_publisher
|
||||
from qommon.storage import StorableObject
|
||||
from qommon import misc
|
||||
from wcs.qommon.storage import StorableObject
|
||||
from wcs.qommon import misc
|
||||
|
||||
class StrongboxType(StorableObject):
|
||||
_names = 'strongbox-types'
|
||||
|
|
|
@ -7,13 +7,13 @@ from quixote.html import TemplateIO, htmltext
|
|||
import wcs
|
||||
import wcs.admin.root
|
||||
|
||||
from qommon import _
|
||||
from qommon import errors, misc
|
||||
from qommon.form import *
|
||||
from qommon.backoffice.menu import html_top
|
||||
from qommon import get_cfg
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import errors, misc
|
||||
from wcs.qommon.form import *
|
||||
from wcs.qommon.backoffice.menu import html_top
|
||||
from wcs.qommon import get_cfg
|
||||
|
||||
from strongbox import StrongboxType, StrongboxItem
|
||||
from .strongbox import StrongboxType, StrongboxItem
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -2,8 +2,8 @@ from quixote import get_request, get_publisher, get_response
|
|||
from qommon.publisher import get_publisher_class
|
||||
from quixote.html import htmltext
|
||||
|
||||
from qommon import _
|
||||
from qommon import template
|
||||
from wcs.qommon import _
|
||||
from wcs.qommon import template
|
||||
from wcs.qommon.admin.texts import TextsDirectory
|
||||
from wcs.categories import Category
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ import pytest
|
|||
|
||||
from quixote import cleanup, get_publisher
|
||||
from wcs.qommon import errors, sessions
|
||||
from qommon.ident.password_accounts import PasswordAccount
|
||||
from wcs.qommon.ident.password_accounts import PasswordAccount
|
||||
from wcs.qommon.http_request import HTTPRequest
|
||||
from wcs.qommon.template import get_current_theme
|
||||
from wcs.categories import Category
|
||||
|
|
|
@ -7,7 +7,7 @@ import pytest
|
|||
|
||||
from quixote import cleanup, get_publisher
|
||||
from wcs.qommon import errors, sessions
|
||||
from qommon.ident.password_accounts import PasswordAccount
|
||||
from wcs.qommon.ident.password_accounts import PasswordAccount
|
||||
from wcs.qommon.http_request import HTTPRequest
|
||||
from wcs.qommon.template import get_current_theme
|
||||
from wcs.categories import Category
|
||||
|
|
|
@ -7,7 +7,7 @@ import pytest
|
|||
|
||||
from quixote import cleanup, get_publisher
|
||||
from wcs.qommon import errors, sessions
|
||||
from qommon.ident.password_accounts import PasswordAccount
|
||||
from wcs.qommon.ident.password_accounts import PasswordAccount
|
||||
from wcs.qommon.http_request import HTTPRequest
|
||||
from wcs.qommon.template import get_current_theme
|
||||
from wcs.categories import Category
|
||||
|
|
|
@ -6,7 +6,7 @@ from webtest import TestApp
|
|||
from quixote import cleanup, get_publisher
|
||||
from django.conf import settings
|
||||
|
||||
from qommon.publisher import set_publisher_class
|
||||
from wcs.qommon.publisher import set_publisher_class
|
||||
import wcs
|
||||
import wcs.wsgi
|
||||
from wcs.qommon.http_request import HTTPRequest
|
||||
|
|
Reference in New Issue