Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AKPlanning
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
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
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
KIF
AKPlanning
Commits
c2fcc620
Commit
c2fcc620
authored
3 years ago
by
Nadja Geisler
Browse files
Options
Downloads
Patches
Plain Diff
remove legacy interest views
parent
b67838fc
No related branches found
Branches containing commit
No related tags found
1 merge request
!111
add interest window
Pipeline
#48618
failed
3 years ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
AKPlanning/urls.py
+1
-1
1 addition, 1 deletion
AKPlanning/urls.py
AKSubmission/urls.py
+0
-2
0 additions, 2 deletions
AKSubmission/urls.py
AKSubmission/views.py
+1
-24
1 addition, 24 deletions
AKSubmission/views.py
with
2 additions
and
27 deletions
AKPlanning/urls.py
+
1
−
1
View file @
c2fcc620
...
@@ -13,10 +13,10 @@ Including another URLconf
...
@@ -13,10 +13,10 @@ Including another URLconf
1. Import the include() function: from django.urls import include, path
1. Import the include() function: from django.urls import include, path
2. Add a URL to urlpatterns: path(
'
blog/
'
, include(
'
blog.urls
'
))
2. Add a URL to urlpatterns: path(
'
blog/
'
, include(
'
blog.urls
'
))
"""
"""
import
debug_toolbar
from
django.apps
import
apps
from
django.apps
import
apps
from
django.contrib
import
admin
from
django.contrib
import
admin
from
django.urls
import
path
,
include
from
django.urls
import
path
,
include
import
debug_toolbar
urlpatterns
=
[
urlpatterns
=
[
path
(
'
admin/
'
,
admin
.
site
.
urls
),
path
(
'
admin/
'
,
admin
.
site
.
urls
),
...
...
This diff is collapsed.
Click to expand it.
AKSubmission/urls.py
+
0
−
2
View file @
c2fcc620
...
@@ -12,8 +12,6 @@ urlpatterns = [
...
@@ -12,8 +12,6 @@ urlpatterns = [
path
(
'
ak/<int:pk>/
'
,
views
.
AKDetailView
.
as_view
(),
name
=
'
ak_detail
'
),
path
(
'
ak/<int:pk>/
'
,
views
.
AKDetailView
.
as_view
(),
name
=
'
ak_detail
'
),
path
(
'
ak/<int:pk>/history/
'
,
views
.
AKHistoryView
.
as_view
(),
name
=
'
ak_history
'
),
path
(
'
ak/<int:pk>/history/
'
,
views
.
AKHistoryView
.
as_view
(),
name
=
'
ak_history
'
),
path
(
'
ak/<int:pk>/edit/
'
,
views
.
AKEditView
.
as_view
(),
name
=
'
ak_edit
'
),
path
(
'
ak/<int:pk>/edit/
'
,
views
.
AKEditView
.
as_view
(),
name
=
'
ak_edit
'
),
path
(
'
ak/<int:pk>/interest/
'
,
views
.
AKInterestView
.
as_view
(),
name
=
'
inc_interest
'
),
path
(
'
ak/<int:pk>/overview_interest/
'
,
views
.
AKOverviewInterestView
.
as_view
(),
name
=
'
overview_inc_interest
'
),
path
(
'
ak/<int:pk>/add_slot/
'
,
views
.
AKSlotAddView
.
as_view
(),
name
=
'
akslot_add
'
),
path
(
'
ak/<int:pk>/add_slot/
'
,
views
.
AKSlotAddView
.
as_view
(),
name
=
'
akslot_add
'
),
path
(
'
ak/<int:pk>/add_message/
'
,
views
.
AKAddOrgaMessageView
.
as_view
(),
name
=
'
akmessage_add
'
),
path
(
'
ak/<int:pk>/add_message/
'
,
views
.
AKAddOrgaMessageView
.
as_view
(),
name
=
'
akmessage_add
'
),
path
(
'
akslot/<int:pk>/edit/
'
,
views
.
AKSlotEditView
.
as_view
(),
name
=
'
akslot_edit
'
),
path
(
'
akslot/<int:pk>/edit/
'
,
views
.
AKSlotEditView
.
as_view
(),
name
=
'
akslot_edit
'
),
...
...
This diff is collapsed.
Click to expand it.
AKSubmission/views.py
+
1
−
24
View file @
c2fcc620
...
@@ -10,7 +10,7 @@ from django.urls import reverse_lazy
...
@@ -10,7 +10,7 @@ from django.urls import reverse_lazy
from
django.utils.datetime_safe
import
datetime
from
django.utils.datetime_safe
import
datetime
from
django.utils.translation
import
gettext_lazy
as
_
from
django.utils.translation
import
gettext_lazy
as
_
from
django.views
import
View
from
django.views
import
View
from
django.views.generic
import
ListView
,
DetailView
,
CreateView
,
UpdateView
,
DeleteView
,
RedirectView
,
TemplateView
from
django.views.generic
import
ListView
,
DetailView
,
CreateView
,
UpdateView
,
DeleteView
,
TemplateView
from
AKModel.availability.models
import
Availability
from
AKModel.availability.models
import
Availability
from
AKModel.models
import
AK
,
AKCategory
,
AKTag
,
AKOwner
,
AKSlot
,
AKTrack
,
AKOrgaMessage
from
AKModel.models
import
AK
,
AKCategory
,
AKTag
,
AKOwner
,
AKSlot
,
AKTrack
,
AKOrgaMessage
...
@@ -286,29 +286,6 @@ class AKEditView(EventSlugMixin, EventInactiveRedirectMixin, UpdateView):
...
@@ -286,29 +286,6 @@ class AKEditView(EventSlugMixin, EventInactiveRedirectMixin, UpdateView):
return
super_form_valid
return
super_form_valid
class
AKInterestView
(
RedirectView
):
permanent
=
False
pattern_name
=
'
submit:ak_detail
'
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
# Increase interest counter for given AK
ak
=
get_object_or_404
(
AK
,
pk
=
kwargs
[
'
pk
'
])
if
ak
.
event
.
active
:
ak
.
increment_interest
()
messages
.
add_message
(
self
.
request
,
messages
.
SUCCESS
,
_
(
"
Interest saved
"
))
return
super
().
get
(
request
,
*
args
,
**
kwargs
)
# when the interest increase request comes from the AK overview page, redirect to that instead of the AK overview page
class
AKOverviewInterestView
(
AKInterestView
):
pattern_name
=
'
submit:submission_overview
'
def
get_redirect_url
(
self
,
*
args
,
**
kwargs
):
# No PK needed for overview page of all AKs
del
kwargs
[
'
pk
'
]
return
super
().
get_redirect_url
(
*
args
,
**
kwargs
)
class
AKOwnerCreateView
(
EventSlugMixin
,
EventInactiveRedirectMixin
,
CreateView
):
class
AKOwnerCreateView
(
EventSlugMixin
,
EventInactiveRedirectMixin
,
CreateView
):
model
=
AKOwner
model
=
AKOwner
template_name
=
'
AKSubmission/akowner_create_update.html
'
template_name
=
'
AKSubmission/akowner_create_update.html
'
...
...
This diff is collapsed.
Click to expand it.
Benjamin Hättasch
@bhaettasch
mentioned in issue
#55 (closed)
·
3 years ago
mentioned in issue
#55 (closed)
mentioned in issue #55
Toggle commit list
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