Skip to content

Commit ebcf075

Browse files
committed
Migrated users and orgs
1 parent 2fcf32d commit ebcf075

62 files changed

Lines changed: 4098 additions & 1730 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

astra_app/api_v1/urls.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
from django.urls import path
22

33
from core import views_membership
4+
from core.views_organizations import organization_detail_api, organizations_api
5+
from core.views_users import users_api
46
from core.views_invitations_api import (
57
account_invitations_accepted_api,
68
account_invitations_bulk_api,
@@ -17,6 +19,21 @@
1719
)
1820

1921
urlpatterns = [
22+
path(
23+
"users",
24+
users_api,
25+
name="api-users",
26+
),
27+
path(
28+
"organizations/<int:organization_id>",
29+
organization_detail_api,
30+
name="api-organization-detail",
31+
),
32+
path(
33+
"organizations",
34+
organizations_api,
35+
name="api-organizations",
36+
),
2037
path(
2138
"membership/request/<int:pk>/rescind",
2239
views_membership.membership_request_rescind_api,

astra_app/core/static/core/js/users_grid.js

Lines changed: 0 additions & 313 deletions
This file was deleted.

astra_app/core/templates/core/_organizations_membership_card.html

Lines changed: 0 additions & 12 deletions
This file was deleted.

astra_app/core/templates/core/_organizations_mirror_search_hidden_fields.html

Lines changed: 0 additions & 2 deletions
This file was deleted.

astra_app/core/templates/core/_organizations_sponsor_search_hidden_fields.html

Lines changed: 0 additions & 2 deletions
This file was deleted.

astra_app/core/templates/core/group_edit.html

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ <h3 class="card-title">Group info</h3>
2424
<form method="post" {% include 'core/_form_validation_attrs.html' with form=form %}>
2525
{% csrf_token %}
2626
<div class="card-body">
27-
{% include 'core/_form_field.html' with field=form.description show_errors=0 %}
27+
{% include 'core/_form_field.html' with field=form.description %}
2828

29-
{% include 'core/_form_field.html' with field=form.fas_url show_errors=0 %}
29+
{% include 'core/_form_field.html' with field=form.fas_url %}
3030

31-
{% include 'core/_form_field.html' with field=form.fas_mailing_list show_errors=0 %}
31+
{% include 'core/_form_field.html' with field=form.fas_mailing_list %}
3232

33-
{% include 'core/_form_field.html' with field=form.fas_discussion_url show_errors=0 %}
33+
{% include 'core/_form_field.html' with field=form.fas_discussion_url %}
3434

3535
<div class="form-group mb-0">
3636
{{ form.fas_irc_channels.label_tag }}
@@ -73,13 +73,6 @@ <h3 class="card-title">Group info</h3>
7373
<div class="mt-3 alert alert-danger">{{ form.non_field_errors }}</div>
7474
{% endif %}
7575

76-
{% for field in form %}
77-
{% if field.errors %}
78-
<div class="mt-2 alert alert-danger">
79-
<strong>{{ field.label }}:</strong> {{ field.errors|join:", " }}
80-
</div>
81-
{% endif %}
82-
{% endfor %}
8376
</div>
8477

8578
<div class="card-footer d-flex justify-content-end" style="gap: .5rem;">

0 commit comments

Comments
 (0)