Skip to content
GitLab
About GitLab
GitLab: the DevOps platform
Explore GitLab
Install GitLab
How GitLab compares
Get started
GitLab docs
GitLab Learn
Pricing
Talk to an expert
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Projects
Groups
Snippets
Sign up now
Login
Sign in
Toggle navigation
Menu
Open sidebar
protokollsystem
proto3
Commits
3b1cb9e6
Commit
3b1cb9e6
authored
Mar 09, 2017
by
Administrator
Browse files
Do not write 'Uhr' for times in the template
parent
bc2581e2
Changes
3
Hide whitespace changes
Inline
Side-by-side
server.py
View file @
3b1cb9e6
...
...
@@ -20,7 +20,7 @@ import math
import
mimetypes
import
config
from
shared
import
db
,
date_filter
,
datetime_filter
,
date_filter_long
,
date_filter_short
,
time_filter
,
ldap_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
shared
import
db
,
date_filter
,
datetime_filter
,
date_filter_long
,
date_filter_short
,
time_filter
,
time_filter_short
,
ldap_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
from
decorators
import
db_lookup
,
require_public_view_right
,
require_private_view_right
,
require_modify_right
,
require_admin_right
from
models.database
import
ProtocolType
,
Protocol
,
DefaultTOP
,
TOP
,
Document
,
Todo
,
Decision
,
MeetingReminder
,
Error
,
TodoMail
,
DecisionDocument
,
TodoState
,
Meta
,
DefaultMeta
...
...
@@ -51,6 +51,7 @@ app.jinja_env.lstrip_blocks = True
app
.
jinja_env
.
filters
[
"datify"
]
=
date_filter
app
.
jinja_env
.
filters
[
"datetimify"
]
=
datetime_filter
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
...
...
shared.py
View file @
3b1cb9e6
...
...
@@ -75,6 +75,8 @@ def date_filter_short(date):
return
date
.
strftime
(
"%d.%m.%Y"
)
def
time_filter
(
time
):
return
time
.
strftime
(
"%H:%M Uhr"
)
def
time_filter_short
(
time
):
return
time
.
strftime
(
"%H:%M"
)
def
needs_date_test
(
todostate
):
return
todostate
.
needs_date
()
...
...
templates/protocol-template.txt
View file @
3b1cb9e6
#Datum;{{protocol.date|datify_short}}
#Beginn;{{protocol.protocoltype.usual_time|timify}}
#Beginn;{{protocol.protocoltype.usual_time|timify
_short
}}
#Ende;
{% for defaultmeta in protocol.protocoltype.metas %}
#{{defaultmeta.key}};
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment