Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
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
Terraform modules
Monitor
Service Desk
Analyze
Contributor 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
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
72418496
Verified
Commit
72418496
authored
5 years ago
by
Tom Teichler
Browse files
Options
Downloads
Patches
Plain Diff
Use edit_group view for group creation.
parent
0566b34a
No related branches found
No related tags found
1 merge request
!39
Add function to create group. Closes #66.
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
biscuit/core/templates/core/create_group.html
+0
-14
0 additions, 14 deletions
biscuit/core/templates/core/create_group.html
biscuit/core/urls.py
+1
-1
1 addition, 1 deletion
biscuit/core/urls.py
biscuit/core/views.py
+6
-27
6 additions, 27 deletions
biscuit/core/views.py
with
7 additions
and
42 deletions
biscuit/core/templates/core/create_group.html
deleted
100644 → 0
+
0
−
14
View file @
0566b34a
{% extends "core/base.html" %}
{% load bootstrap4 i18n %}
{% block page_title %}{% blocktrans %}Create group{% endblocktrans %}{% endblock %}
{% block content %}
<form
method=
"post"
>
{% csrf_token %}
{% bootstrap_form create_group_form %}
<input
type=
"submit"
value=
"Edit"
/>
</form>
{% endblock %}
This diff is collapsed.
Click to expand it.
biscuit/core/urls.py
+
1
−
1
View file @
72418496
...
...
@@ -19,7 +19,7 @@ urlpatterns = [
{
'
template
'
:
'
card
'
},
name
=
'
person_by_id_card
'
),
path
(
'
person/<int:id_>/edit
'
,
views
.
edit_person
,
name
=
'
edit_person_by_id
'
),
path
(
'
groups
'
,
views
.
groups
,
name
=
'
groups
'
),
path
(
'
group/create
'
,
views
.
create
_group
,
name
=
'
create_group
'
),
path
(
'
group/create
'
,
views
.
edit
_group
,
name
=
'
create_group
'
),
path
(
'
group/<int:id_>
'
,
views
.
group
,
{
'
template
'
:
'
full
'
},
name
=
'
group_by_id
'
),
path
(
'
group/<int:id_>/edit
'
,
views
.
edit_group
,
name
=
'
edit_group_by_id
'
),
...
...
This diff is collapsed.
Click to expand it.
biscuit/core/views.py
+
6
−
27
View file @
72418496
from
typing
import
Callable
from
typing
import
Callable
,
Optional
from
django.contrib.auth.decorators
import
login_required
from
django.http
import
Http404
,
HttpRequest
,
HttpResponse
...
...
@@ -165,12 +165,15 @@ def edit_person(request: HttpRequest, id_: int) -> HttpResponse:
@admin_required
def
edit_group
(
request
:
HttpRequest
,
id_
:
int
)
->
HttpResponse
:
def
edit_group
(
request
:
HttpRequest
,
id_
:
[
Optional
]
int
)
->
HttpResponse
:
context
=
{}
group
=
get_object_or_404
(
Group
,
id
=
id_
)
edit_group_form
=
EditGroupForm
(
request
.
POST
or
None
,
instance
=
group
)
if
id_
:
edit_group_form
=
EditGroupForm
(
request
.
POST
or
None
,
instance
=
group
)
else
:
edit_group_form
=
EditGroupForm
(
request
.
POST
or
None
)
if
request
.
method
==
'
POST
'
:
if
edit_group_form
.
is_valid
():
...
...
@@ -188,27 +191,3 @@ def edit_group(request: HttpRequest, id_: int) -> HttpResponse:
def
data_management
(
request
:
HttpRequest
)
->
HttpResponse
:
context
=
{}
return
render
(
request
,
'
core/data_management.html
'
,
context
)
@admin_required
def
create_group
(
request
:
HttpRequest
)
->
HttpResponse
:
context
=
{}
create_group_form
=
EditGroupForm
(
request
.
POST
or
None
)
if
request
.
method
==
'
POST
'
:
create_group_form
=
EditGroupForm
(
request
.
POST
)
if
create_group_form
.
is_valid
():
create_group
=
Group
.
objects
.
create
(
name
=
create_group_form
.
cleaned_data
[
'
name
'
],
short_name
=
create_group_form
.
cleaned_data
[
'
short_name
'
],
members
=
create_group_form
.
cleaned_data
[
'
members
'
],
owners
=
create_group_form
.
cleaned_data
[
'
owners
'
]
)
messages
.
success
(
request
,
_
(
'
The group has been created.
'
))
return
redirect
(
'
groups
'
)
context
[
'
create_group_form
'
]
=
create_group_form
return
render
(
request
,
'
core/create_group.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