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
3b1cb9e6
Commit
3b1cb9e6
authored
8 years ago
by
Administrator
Browse files
Options
Downloads
Patches
Plain Diff
Do not write 'Uhr' for times in the template
parent
bc2581e2
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
server.py
+2
-1
2 additions, 1 deletion
server.py
shared.py
+2
-0
2 additions, 0 deletions
shared.py
templates/protocol-template.txt
+1
-1
1 addition, 1 deletion
templates/protocol-template.txt
with
5 additions
and
2 deletions
server.py
+
2
−
1
View file @
3b1cb9e6
...
@@ -20,7 +20,7 @@ import math
...
@@ -20,7 +20,7 @@ import math
import
mimetypes
import
mimetypes
import
config
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
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
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
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
...
@@ -51,6 +51,7 @@ app.jinja_env.lstrip_blocks = True
app
.
jinja_env
.
filters
[
"
datify
"
]
=
date_filter
app
.
jinja_env
.
filters
[
"
datify
"
]
=
date_filter
app
.
jinja_env
.
filters
[
"
datetimify
"
]
=
datetime_filter
app
.
jinja_env
.
filters
[
"
datetimify
"
]
=
datetime_filter
app
.
jinja_env
.
filters
[
"
timify
"
]
=
time_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_short
"
]
=
date_filter_short
app
.
jinja_env
.
filters
[
"
datify_long
"
]
=
date_filter_long
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
...
...
This diff is collapsed.
Click to expand it.
shared.py
+
2
−
0
View file @
3b1cb9e6
...
@@ -75,6 +75,8 @@ def date_filter_short(date):
...
@@ -75,6 +75,8 @@ def date_filter_short(date):
return
date
.
strftime
(
"
%d.%m.%Y
"
)
return
date
.
strftime
(
"
%d.%m.%Y
"
)
def
time_filter
(
time
):
def
time_filter
(
time
):
return
time
.
strftime
(
"
%H:%M Uhr
"
)
return
time
.
strftime
(
"
%H:%M Uhr
"
)
def
time_filter_short
(
time
):
return
time
.
strftime
(
"
%H:%M
"
)
def
needs_date_test
(
todostate
):
def
needs_date_test
(
todostate
):
return
todostate
.
needs_date
()
return
todostate
.
needs_date
()
...
...
This diff is collapsed.
Click to expand it.
templates/protocol-template.txt
+
1
−
1
View file @
3b1cb9e6
#Datum;{{protocol.date|datify_short}}
#Datum;{{protocol.date|datify_short}}
#Beginn;{{protocol.protocoltype.usual_time|timify}}
#Beginn;{{protocol.protocoltype.usual_time|timify
_short
}}
#Ende;
#Ende;
{% for defaultmeta in protocol.protocoltype.metas %}
{% for defaultmeta in protocol.protocoltype.metas %}
#{{defaultmeta.key}};
#{{defaultmeta.key}};
...
...
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