Renamed tcmui to ccui.
This commit is contained in:
Родитель
3f5453db15
Коммит
11d289adf9
|
@ -1,6 +1,6 @@
|
|||
.sass-cache
|
||||
collected-assets/*
|
||||
tcmui/settings/local.py
|
||||
ccui/settings/local.py
|
||||
coverage/*
|
||||
.livereload
|
||||
*.pyc
|
||||
|
|
|
@ -25,7 +25,7 @@ from .. import __version__
|
|||
|
||||
|
||||
|
||||
log = logging.getLogger("tcmui.core.api")
|
||||
log = logging.getLogger("ccui.core.api")
|
||||
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ from .log import log_api_call
|
|||
|
||||
|
||||
|
||||
log = logging.getLogger("tcmui.core.cache")
|
||||
log = logging.getLogger("ccui.core.cache")
|
||||
|
||||
|
||||
|
|
@ -2,7 +2,7 @@ import logging
|
|||
|
||||
|
||||
|
||||
log = logging.getLogger("tcmui.core.log.api")
|
||||
log = logging.getLogger("ccui.core.log.api")
|
||||
|
||||
|
||||
|
|
@ -9,7 +9,7 @@ config in your ``settings/local.py`` similar to this::
|
|||
"version": 1,
|
||||
"formatters": {
|
||||
"html": {
|
||||
"()": "tcmui.debug.apilog.APILogHTMLFormatter"
|
||||
"()": "ccui.debug.apilog.APILogHTMLFormatter"
|
||||
}
|
||||
},
|
||||
"handlers": {
|
||||
|
@ -23,11 +23,11 @@ config in your ``settings/local.py`` similar to this::
|
|||
}
|
||||
},
|
||||
"loggers": {
|
||||
"tcmui.core.log.api": {
|
||||
"ccui.core.log.api": {
|
||||
"handlers": ["apilog"],
|
||||
"level": "DEBUG",
|
||||
},
|
||||
"tcmui.core.middleware.RequestLogMiddleware": {
|
||||
"ccui.core.middleware.RequestLogMiddleware": {
|
||||
"handlers": ["apilog"],
|
||||
"level": "DEBUG",
|
||||
},
|
|
@ -10,7 +10,7 @@ from django.template.loader import render_to_string
|
|||
from ..core.conf import conf
|
||||
|
||||
|
||||
log = logging.getLogger("tcmui.core.log.api")
|
||||
log = logging.getLogger("ccui.core.log.api")
|
||||
|
||||
handler = MemoryHandler(capacity=conf.CC_DEBUG_API_LOG_RECORDS)
|
||||
|
||||
|
@ -27,7 +27,7 @@ class NoDebugFilter(Filter):
|
|||
if conf.CC_DEBUG_API_LOG:
|
||||
log.setLevel(logging.DEBUG)
|
||||
log.addHandler(handler)
|
||||
ui_req_log = logging.getLogger("tcmui.core.middleware.RequestLogMiddleware")
|
||||
ui_req_log = logging.getLogger("ccui.core.middleware.RequestLogMiddleware")
|
||||
ui_req_log.setLevel(logging.DEBUG)
|
||||
ui_req_log.addFilter(NoDebugFilter())
|
||||
ui_req_log.addHandler(handler)
|
|
@ -6,7 +6,7 @@ from django.http import HttpResponse
|
|||
|
||||
|
||||
|
||||
log = logging.getLogger("tcmui.core.middleware.RequestLogMiddleware")
|
||||
log = logging.getLogger("ccui.core.middleware.RequestLogMiddleware")
|
||||
|
||||
|
||||
|
|
@ -8,6 +8,6 @@ urlpatterns = patterns("")
|
|||
|
||||
if conf.CC_DEBUG_API_LOG:
|
||||
urlpatterns += patterns(
|
||||
"tcmui.debug.views",
|
||||
"ccui.debug.views",
|
||||
url("^apilog/$", "apilog", name="debug_apilog"),
|
||||
)
|
|
@ -2,13 +2,13 @@ from django.forms.formsets import formset_factory, BaseFormSet
|
|||
|
||||
import floppyforms as forms
|
||||
|
||||
from ..core import forms as tcmforms
|
||||
from ..core import forms as ccforms
|
||||
from ..core.util import id_for_object
|
||||
|
||||
from .models import EnvironmentGroupList
|
||||
from .util import environments_of
|
||||
|
||||
class EnvironmentSelectionForm(tcmforms.NonFieldErrorsClassFormMixin,
|
||||
class EnvironmentSelectionForm(ccforms.NonFieldErrorsClassFormMixin,
|
||||
forms.Form):
|
||||
"""
|
||||
A form for selecting an environment group from a set of possible
|
|
@ -4,7 +4,7 @@ Environment-related remote objects.
|
|||
The nomenclature here is a massive pile of confusion, because the platform
|
||||
follows one set of terminology that was determined to be too confusing for the
|
||||
UI to use, so the UI uses a different set of terms. The translation, more or
|
||||
less, takes place in this file and tcmui/manage/views.py. Templates should
|
||||
less, takes place in this file and ccui/manage/views.py. Templates should
|
||||
exclusively use UI terms.
|
||||
|
||||
Here, for reference, is a translation table with examples:
|
|
@ -2,7 +2,7 @@ from django.core.exceptions import ValidationError
|
|||
|
||||
import floppyforms as forms
|
||||
|
||||
from ..core import forms as tcmforms
|
||||
from ..core import forms as ccforms
|
||||
|
||||
from ..products.models import Product, ProductList
|
||||
from ..testcases.bulk import BulkParser
|
||||
|
@ -19,10 +19,10 @@ def product_id_attrs(obj):
|
|||
|
||||
|
||||
|
||||
class ProductForm(tcmforms.AddEditForm):
|
||||
class ProductForm(ccforms.AddEditForm):
|
||||
name = forms.CharField()
|
||||
description = forms.CharField(widget=tcmforms.BareTextarea)
|
||||
team = tcmforms.ModelMultipleChoiceField(required=False)
|
||||
description = forms.CharField(widget=ccforms.BareTextarea)
|
||||
team = ccforms.ModelMultipleChoiceField(required=False)
|
||||
|
||||
|
||||
assign_later = ["team"]
|
||||
|
@ -33,7 +33,7 @@ class ProductForm(tcmforms.AddEditForm):
|
|||
def __init__(self, *args, **kwargs):
|
||||
self.company = kwargs.pop("company")
|
||||
if "instance" not in kwargs:
|
||||
self.base_fields["profile"] = tcmforms.ModelChoiceField()
|
||||
self.base_fields["profile"] = ccforms.ModelChoiceField()
|
||||
|
||||
super(ProductForm, self).__init__(*args, **kwargs)
|
||||
|
||||
|
@ -44,13 +44,13 @@ class ProductForm(tcmforms.AddEditForm):
|
|||
|
||||
|
||||
|
||||
class TestCycleForm(tcmforms.AddEditForm):
|
||||
class TestCycleForm(ccforms.AddEditForm):
|
||||
name = forms.CharField()
|
||||
description = forms.CharField(widget=tcmforms.BareTextarea)
|
||||
product = tcmforms.ModelChoiceField()
|
||||
description = forms.CharField(widget=ccforms.BareTextarea)
|
||||
product = ccforms.ModelChoiceField()
|
||||
start_date = forms.DateField()
|
||||
end_date = forms.DateField(required=False)
|
||||
team = tcmforms.ModelMultipleChoiceField(required=False)
|
||||
team = ccforms.ModelMultipleChoiceField(required=False)
|
||||
|
||||
|
||||
no_edit_fields = ["product"]
|
||||
|
@ -67,15 +67,15 @@ class TestCycleForm(tcmforms.AddEditForm):
|
|||
|
||||
|
||||
|
||||
class TestRunForm(tcmforms.AddEditForm):
|
||||
class TestRunForm(ccforms.AddEditForm):
|
||||
name = forms.CharField()
|
||||
description = forms.CharField(widget=tcmforms.BareTextarea)
|
||||
test_cycle = tcmforms.ModelChoiceField(
|
||||
description = forms.CharField(widget=ccforms.BareTextarea)
|
||||
test_cycle = ccforms.ModelChoiceField(
|
||||
option_attrs=product_id_attrs)
|
||||
start_date = forms.DateField()
|
||||
end_date = forms.DateField(required=False)
|
||||
team = tcmforms.ModelMultipleChoiceField(required=False)
|
||||
suites = tcmforms.ModelMultipleChoiceField(
|
||||
team = ccforms.ModelMultipleChoiceField(required=False)
|
||||
suites = ccforms.ModelMultipleChoiceField(
|
||||
required=False, option_attrs=product_id_attrs)
|
||||
|
||||
|
||||
|
@ -94,12 +94,12 @@ class TestRunForm(tcmforms.AddEditForm):
|
|||
|
||||
|
||||
|
||||
class TestSuiteForm(tcmforms.AddEditForm):
|
||||
class TestSuiteForm(ccforms.AddEditForm):
|
||||
name = forms.CharField()
|
||||
description = forms.CharField(widget=tcmforms.BareTextarea)
|
||||
product = tcmforms.ModelChoiceField(
|
||||
description = forms.CharField(widget=ccforms.BareTextarea)
|
||||
product = ccforms.ModelChoiceField(
|
||||
option_attrs=lambda p: {"data-product-id": p.id})
|
||||
cases = tcmforms.ModelMultipleChoiceField(
|
||||
cases = ccforms.ModelMultipleChoiceField(
|
||||
required=False,
|
||||
label_from_instance=lambda c: c.name,
|
||||
option_attrs=product_id_attrs)
|
||||
|
@ -112,9 +112,9 @@ class TestSuiteForm(tcmforms.AddEditForm):
|
|||
|
||||
|
||||
|
||||
class BulkTestCaseForm(tcmforms.RemoteObjectForm):
|
||||
product = tcmforms.ModelChoiceField()
|
||||
cases = forms.CharField(widget=tcmforms.BareTextarea)
|
||||
class BulkTestCaseForm(ccforms.RemoteObjectForm):
|
||||
product = ccforms.ModelChoiceField()
|
||||
cases = forms.CharField(widget=ccforms.BareTextarea)
|
||||
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
|
@ -185,9 +185,9 @@ class BulkTestCaseForm(tcmforms.RemoteObjectForm):
|
|||
|
||||
|
||||
|
||||
class TestCaseForm(tcmforms.AddEditForm):
|
||||
class TestCaseForm(ccforms.AddEditForm):
|
||||
name = forms.CharField()
|
||||
product = tcmforms.ModelChoiceField()
|
||||
product = ccforms.ModelChoiceField()
|
||||
# @@@ tags = forms.CharField(required=False)
|
||||
|
||||
|
|
@ -3,7 +3,7 @@ from django.views.generic.simple import direct_to_template
|
|||
|
||||
|
||||
urlpatterns = patterns(
|
||||
"tcmui.manage.views",
|
||||
"ccui.manage.views",
|
||||
url("^$", "home", name="manage"),
|
||||
|
||||
# products
|
|
@ -3,7 +3,7 @@ from django.conf.urls.defaults import patterns, url
|
|||
|
||||
|
||||
urlpatterns = patterns(
|
||||
"tcmui.results.views",
|
||||
"ccui.results.views",
|
||||
url("^$", "home", name="results"),
|
||||
|
||||
url(r"^testcycles/$", "testcycles", name="results_testcycles"),
|
|
@ -1,5 +1,5 @@
|
|||
"""
|
||||
Default Django settings for tcmui project.
|
||||
Default Django settings for ccui project.
|
||||
|
||||
"""
|
||||
from os.path import dirname, join, abspath
|
||||
|
@ -78,12 +78,12 @@ MIDDLEWARE_CLASSES = [
|
|||
"django.middleware.csrf.CsrfViewMiddleware",
|
||||
"django.contrib.messages.middleware.MessageMiddleware",
|
||||
"djangosecure.middleware.SecurityMiddleware",
|
||||
"tcmui.core.middleware.StaticCompanyMiddleware",
|
||||
"tcmui.users.middleware.AuthenticationMiddleware",
|
||||
"tcmui.environments.middleware.EnvironmentsMiddleware",
|
||||
"ccui.core.middleware.StaticCompanyMiddleware",
|
||||
"ccui.users.middleware.AuthenticationMiddleware",
|
||||
"ccui.environments.middleware.EnvironmentsMiddleware",
|
||||
]
|
||||
|
||||
ROOT_URLCONF = "tcmui.urls"
|
||||
ROOT_URLCONF = "ccui.urls"
|
||||
|
||||
TEMPLATE_DIRS = [
|
||||
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
|
||||
|
@ -98,12 +98,12 @@ INSTALLED_APPS = [
|
|||
"django.contrib.sessions",
|
||||
"django.contrib.messages",
|
||||
"django.contrib.staticfiles",
|
||||
"tcmui.core",
|
||||
"tcmui.static",
|
||||
"tcmui.users",
|
||||
"tcmui.products",
|
||||
"tcmui.environments",
|
||||
"tcmui.testexecution"
|
||||
"ccui.core",
|
||||
"ccui.static",
|
||||
"ccui.users",
|
||||
"ccui.products",
|
||||
"ccui.environments",
|
||||
"ccui.testexecution"
|
||||
]
|
||||
|
||||
CACHES = {
|
||||
|
@ -139,7 +139,7 @@ LOGGING = {
|
|||
|
||||
INSTALLED_APPS += ["compressor"]
|
||||
COMPRESS_CSS_FILTERS = ["compressor.filters.css_default.CssAbsoluteFilter",
|
||||
"tcmui.compressor_filters.SlimmerCSSFilter"]
|
||||
"ccui.compressor_filters.SlimmerCSSFilter"]
|
||||
|
||||
INSTALLED_APPS += ["floppyforms"]
|
||||
|
|
@ -6,14 +6,14 @@ except ImportError:
|
|||
pass
|
||||
|
||||
CACHES["default"]["VERSION"] = 7
|
||||
CACHES["default"]["KEY_FUNCTION"] = "tcmui.core.cacheconfig.make_key"
|
||||
CACHES["default"]["KEY_FUNCTION"] = "ccui.core.cacheconfig.make_key"
|
||||
|
||||
COMPRESS_ROOT = STATIC_ROOT
|
||||
COMPRESS_URL = STATIC_URL
|
||||
|
||||
if DEBUG:
|
||||
MIDDLEWARE_CLASSES.insert(
|
||||
0, "tcmui.debug.middleware.AjaxTracebackMiddleware")
|
||||
0, "ccui.debug.middleware.AjaxTracebackMiddleware")
|
||||
MIDDLEWARE_CLASSES.insert(
|
||||
0, "tcmui.debug.middleware.RequestLogMiddleware")
|
||||
INSTALLED_APPS += ["tcmui.debug"]
|
||||
0, "ccui.debug.middleware.RequestLogMiddleware")
|
||||
INSTALLED_APPS += ["ccui.debug"]
|
|
@ -2,7 +2,7 @@ from django.core.cache import cache
|
|||
|
||||
from .models import ArrayOfCodeValue
|
||||
|
||||
from tcmui.core.conf import conf
|
||||
from ccui.core.conf import conf
|
||||
|
||||
|
||||
def get_codevalue(key, id_):
|
|
@ -2,15 +2,15 @@ from django.forms.formsets import formset_factory, BaseFormSet
|
|||
|
||||
import floppyforms as forms
|
||||
|
||||
from ..core import forms as tcmforms
|
||||
from ..core import forms as ccforms
|
||||
|
||||
from .models import TestCaseStep
|
||||
|
||||
|
||||
|
||||
class StepForm(tcmforms.NonFieldErrorsClassFormMixin, forms.Form):
|
||||
instruction = forms.CharField(widget=tcmforms.BareTextarea)
|
||||
expected_result = forms.CharField(widget=tcmforms.BareTextarea)
|
||||
class StepForm(ccforms.NonFieldErrorsClassFormMixin, forms.Form):
|
||||
instruction = forms.CharField(widget=ccforms.BareTextarea)
|
||||
expected_result = forms.CharField(widget=ccforms.BareTextarea)
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
self.instance = kwargs.pop("instance", None)
|
|
@ -5,33 +5,33 @@ from django.conf import settings
|
|||
|
||||
urlpatterns = patterns(
|
||||
"",
|
||||
url("^account/", include("tcmui.users.urls")),
|
||||
url("^account/", include("ccui.users.urls")),
|
||||
|
||||
# run tests
|
||||
url("^$", "tcmui.testexecution.views.home", name="runtests"),
|
||||
url("^$", "ccui.testexecution.views.home", name="runtests"),
|
||||
url("^environment/$",
|
||||
"tcmui.environments.views.set_environment",
|
||||
"ccui.environments.views.set_environment",
|
||||
name="environment"),
|
||||
url("^run/(?P<testrun_id>\d+)/$",
|
||||
"tcmui.testexecution.views.runtests",
|
||||
"ccui.testexecution.views.runtests",
|
||||
name="runtests_run"),
|
||||
|
||||
# runtests ajax
|
||||
url("^runtests/_finder/environments/(?P<run_id>\d+)/",
|
||||
"tcmui.testexecution.views.finder_environments",
|
||||
"ccui.testexecution.views.finder_environments",
|
||||
name="runtests_finder_environments"),
|
||||
url("^_result/(?P<result_id>\d+)/$",
|
||||
"tcmui.testexecution.views.result",
|
||||
"ccui.testexecution.views.result",
|
||||
name="result"),
|
||||
|
||||
# manage
|
||||
url("^manage/", include("tcmui.manage.urls")),
|
||||
url("^manage/", include("ccui.manage.urls")),
|
||||
|
||||
# results
|
||||
url("^results/", include("tcmui.results.urls")),
|
||||
url("^results/", include("ccui.results.urls")),
|
||||
)
|
||||
|
||||
if settings.DEBUG:
|
||||
urlpatterns += patterns(
|
||||
"",
|
||||
url("^debug/", include("tcmui.debug.urls")))
|
||||
url("^debug/", include("ccui.debug.urls")))
|
Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше
Загрузка…
Ссылка в новой задаче