Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
proto3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
protokollsystem
proto3
Commits
bfcd5842
Commit
bfcd5842
authored
Sep 16, 2017
by
Robin Sonnabend
Browse files
Options
Downloads
Patches
Plain Diff
Remove unused url_manager
parent
6e08a31e
No related branches found
No related tags found
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
config.py.example
+0
-6
0 additions, 6 deletions
config.py.example
models/database.py
+1
-1
1 addition, 1 deletion
models/database.py
server.py
+2
-2
2 additions, 2 deletions
server.py
tasks.py
+3
-3
3 additions, 3 deletions
tasks.py
utils.py
+1
-1
1 addition, 1 deletion
utils.py
with
7 additions
and
13 deletions
config.py.example
+
0
−
6
View file @
bfcd5842
...
...
@@ -20,12 +20,6 @@ CELERY_BROKER_URL = "redis://localhost:6379/0"
CELERY_TASK_SERIALIZER = "pickle" # do not change
CELERY_ACCEPT_CONTENT = ["pickle"] # do not change
# this websites address
URL_ROOT = "protokolle.example.com"
URL_PROTO = "https"
URL_PATH = "/"
URL_PARAMS = ""
# CUPS printserver (optional)
PRINTING_ACTIVE = True
PRINTING_SERVER = "printsrv.example.com:631"
...
...
This diff is collapsed.
Click to expand it.
models/database.py
+
1
−
1
View file @
bfcd5842
...
...
@@ -7,7 +7,7 @@ from enum import Enum
from
uuid
import
uuid4
from
shared
import
db
,
date_filter
,
date_filter_short
,
escape_tex
,
DATE_KEY
,
START_TIME_KEY
,
END_TIME_KEY
,
current_user
from
utils
import
random_string
,
url_manager
,
get_etherpad_url
,
split_terms
,
check_ip_in_networks
from
utils
import
random_string
,
get_etherpad_url
,
split_terms
,
check_ip_in_networks
from
models.errors
import
DateNotMatchingException
import
os
...
...
This diff is collapsed.
Click to expand it.
server.py
+
2
−
2
View file @
bfcd5842
...
...
@@ -21,7 +21,7 @@ import mimetypes
import
config
from
shared
import
db
,
date_filter
,
datetime_filter
,
date_filter_long
,
date_filter_short
,
time_filter
,
time_filter_short
,
user_manager
,
security_manager
,
current_user
,
check_login
,
login_required
,
group_required
,
class_filter
,
needs_date_test
,
todostate_name_filter
,
code_filter
,
indent_tab_filter
from
utils
import
is_past
,
mail_manager
,
url_manager
,
get_first_unused_int
,
set_etherpad_text
,
get_etherpad_text
,
split_terms
,
optional_int_arg
,
fancy_join
,
footnote_hash
from
utils
import
is_past
,
mail_manager
,
get_first_unused_int
,
set_etherpad_text
,
get_etherpad_text
,
split_terms
,
optional_int_arg
,
fancy_join
,
footnote_hash
from
decorators
import
db_lookup
,
require_public_view_right
,
require_private_view_right
,
require_modify_right
,
require_publish_right
,
require_admin_right
from
models.database
import
ProtocolType
,
Protocol
,
DefaultTOP
,
TOP
,
LocalTOP
,
Document
,
Todo
,
Decision
,
MeetingReminder
,
Error
,
TodoMail
,
DecisionDocument
,
TodoState
,
Meta
,
DefaultMeta
,
DecisionCategory
,
Like
from
views.forms
import
LoginForm
,
ProtocolTypeForm
,
DefaultTopForm
,
MeetingReminderForm
,
NewProtocolForm
,
DocumentUploadForm
,
KnownProtocolSourceUploadForm
,
NewProtocolSourceUploadForm
,
generate_protocol_form
,
TopForm
,
LocalTopForm
,
SearchForm
,
DecisionSearchForm
,
ProtocolSearchForm
,
TodoSearchForm
,
NewProtocolFileUploadForm
,
NewTodoForm
,
TodoForm
,
TodoMailForm
,
DefaultMetaForm
,
MetaForm
,
MergeTodosForm
,
DecisionCategoryForm
,
DocumentEditForm
...
...
@@ -54,7 +54,7 @@ app.jinja_env.filters["timify"] = time_filter
app
.
jinja_env
.
filters
[
"
timify_short
"
]
=
time_filter_short
app
.
jinja_env
.
filters
[
"
datify_short
"
]
=
date_filter_short
app
.
jinja_env
.
filters
[
"
datify_long
"
]
=
date_filter_long
app
.
jinja_env
.
filters
[
"
url_complete
"
]
=
url_manager
.
complete
#
app.jinja_env.filters["url_complete"] = url_manager.complete
app
.
jinja_env
.
filters
[
"
class
"
]
=
class_filter
app
.
jinja_env
.
filters
[
"
todo_get_name
"
]
=
todostate_name_filter
app
.
jinja_env
.
filters
[
"
code
"
]
=
code_filter
...
...
This diff is collapsed.
Click to expand it.
tasks.py
+
3
−
3
View file @
bfcd5842
...
...
@@ -12,7 +12,7 @@ from models.database import Document, Protocol, Error, Todo, Decision, TOP, Defa
from
models.errors
import
DateNotMatchingException
from
server
import
celery
,
app
from
shared
import
db
,
escape_tex
,
unhyphen
,
date_filter
,
datetime_filter
,
date_filter_long
,
date_filter_short
,
time_filter
,
class_filter
,
KNOWN_KEYS
from
utils
import
mail_manager
,
url_manager
,
encode_kwargs
,
decode_kwargs
,
add_line_numbers
,
set_etherpad_text
,
get_etherpad_text
,
footnote_hash
from
utils
import
mail_manager
,
encode_kwargs
,
decode_kwargs
,
add_line_numbers
,
set_etherpad_text
,
get_etherpad_text
,
footnote_hash
from
protoparser
import
parse
,
ParserException
,
Element
,
Content
,
Text
,
Tag
,
Remark
,
Fork
,
RenderType
from
wiki
import
WikiClient
,
WikiException
from
calendarpush
import
Client
as
CalendarClient
,
CalendarException
...
...
@@ -31,7 +31,7 @@ texenv.filters["escape_tex"] = escape_tex
texenv
.
filters
[
"
unhyphen
"
]
=
unhyphen
texenv
.
trim_blocks
=
True
texenv
.
lstrip_blocks
=
True
texenv
.
filters
[
"
url_complete
"
]
=
url_manager
.
complete
#
texenv.filters["url_complete"] = url_manager.complete
texenv
.
filters
[
"
datify
"
]
=
date_filter
texenv
.
filters
[
"
datify_long
"
]
=
date_filter_long
texenv
.
filters
[
"
datify_short
"
]
=
date_filter_short
...
...
@@ -60,7 +60,7 @@ texenv.globals["latex_header_footer"] = latex_header_footer
mailenv
=
app
.
create_jinja_environment
()
mailenv
.
trim_blocks
=
True
mailenv
.
lstrip_blocks
=
True
mailenv
.
filters
[
"
url_complete
"
]
=
url_manager
.
complete
#
mailenv.filters["url_complete"] = url_manager.complete
mailenv
.
filters
[
"
datify
"
]
=
date_filter
mailenv
.
filters
[
"
datetimify
"
]
=
datetime_filter
...
...
This diff is collapsed.
Click to expand it.
utils.py
+
1
−
1
View file @
bfcd5842
...
...
@@ -63,7 +63,7 @@ class UrlManager:
params
=
match
.
group
(
"
params
"
)
or
self
.
params
return
self
.
base
.
format
(
proto
,
root
,
path
,
"
?
"
+
params
if
len
(
params
)
>
0
else
""
)
url_manager
=
UrlManager
(
config
)
#
url_manager = UrlManager(config)
class
MailManager
:
def
__init__
(
self
,
config
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment