Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TIC-Desk
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Teckids
TIC-Desk
Commits
fb4c2982
Commit
fb4c2982
authored
5 years ago
by
Tom Teichler
Browse files
Options
Downloads
Plain Diff
Merge branch 'issue77' into 'master'
Add search field to navbar. Advances
#77
. See merge request
!52
parents
6f0b83fc
333b6b84
No related branches found
No related tags found
1 merge request
!52
Add search field to navbar. Advances #77.
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ticdesk/templates/ticdesk/base.html
+6
-1
6 additions, 1 deletion
ticdesk/templates/ticdesk/base.html
ticdesk_org/views.py
+3
-2
3 additions, 2 deletions
ticdesk_org/views.py
with
9 additions
and
3 deletions
ticdesk/templates/ticdesk/base.html
+
6
−
1
View file @
fb4c2982
...
...
@@ -22,7 +22,12 @@
<div
class=
"collapse navbar-collapse"
id=
"navbar-main"
>
<ul
class=
"nav navbar-nav ml-auto"
>
{% if user.is_authenticated %}
{% if user.is_member %}
<form
class=
"form-inline"
action=
"{% url "
ticdesk_org:person
"
%}"
method=
"GET"
>
<input
class=
"form-control mr-sm-2"
type=
"search"
placeholder=
"Benutzername"
aria-label=
"Search"
name=
"uid"
/>
</form>
{% endif %}
{% if user.is_authenticated %}
<li
class=
"nav-item dropdown"
>
<a
class=
"nav-link dropdown-toggle"
data-toggle=
"dropdown"
id=
"navbarDropdown"
aria-expanded=
"false"
role=
"button"
aria-haspopup=
"true"
href=
"#"
>
{% blocktrans %}Veranstaltungen{% endblocktrans %}
...
...
This diff is collapsed.
Click to expand it.
ticdesk_org/views.py
+
3
−
2
View file @
fb4c2982
...
...
@@ -25,7 +25,8 @@ def person(request, uid=None):
# Redirect to own listing if no uid given
if
uid
is
None
:
return
redirect
(
reverse
(
'
org:person_by_uid
'
,
args
=
[
request
.
user
.
username
]))
target_uid
=
request
.
GET
.
get
(
'
uid
'
)
or
request
.
user
.
username
return
redirect
(
reverse
(
'
org:person_by_uid
'
,
args
=
[
target_uid
]))
# Get person and check access
try
:
...
...
@@ -397,7 +398,7 @@ def delete_voucher(request, voucher_id):
current_voucher
.
deleted
=
True
current_voucher
.
save
()
context
[
'
deleted
'
]
=
True
return
render
(
request
,
'
ticdesk_org/vouchers.html
'
,
context
)
...
...
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