Compare commits

..

6 Commits

Author SHA1 Message Date
1a0a19531e Merge pull request 'Docker_tmp' (#188) from Docker_tmp into Docker
Reviewed-on: SGD-Nord/konova#188
2022-08-02 09:54:31 +02:00
8653166154 Revert "Revert "Merge branch 'Docker' into master""
This reverts commit a955e9f564.
2022-08-02 09:44:25 +02:00
b89cbc8484 Merge pull request 'master' (#187) from master into Docker_tmp
Reviewed-on: SGD-Nord/konova#187
2022-08-02 09:43:04 +02:00
f717e650e6 Merge pull request '#185 Parcel loading on public reports' (#186) from 185_Parcels_loading_CORS_error into master
Reviewed-on: SGD-Nord/konova#186
2022-08-02 09:38:44 +02:00
ac49f983ee #185 Parcel loading on public reports
* fixes bug where unauthorized clients would not load a geometries parcel view properly
* minor general templates enhancements
2022-08-02 09:38:03 +02:00
a955e9f564 Revert "Merge branch 'Docker' into master"
This reverts commit 8c47c8ae35, reversing
changes made to 2206565673.

Undos accidental remote merge
2022-07-13 11:21:51 +02:00
3 changed files with 2 additions and 4 deletions

View File

@ -102,7 +102,6 @@ def home_view(request: HttpRequest):
return render(request, template, context)
@login_required
def get_geom_parcels(request: HttpRequest, id: str):
""" Getter for HTMX
@ -157,7 +156,6 @@ def get_geom_parcels(request: HttpRequest, id: str):
return HttpResponse(None, status=404)
@login_required
def get_geom_parcels_content(request: HttpRequest, id: str, page: int):
""" Getter for infinite scroll of HTMX

View File

@ -31,7 +31,7 @@
</div>
{% endfor %}
</div>
<div class="container-fluid mt-3 px-4">
<div class="container-fluid mt-3 mb-5 px-4">
{% comment %}
The modal wrapper, which can be used on every view can stay on the base.html template
{% endcomment %}

View File

@ -14,8 +14,8 @@
{% block body %}
<div class="container">
<h4>{% trans 'Teams' %}</h4>
<div class="col-md">
<h4>{% trans 'Teams' %}</h4>
<button class="btn rlp-r btn-modal" data-form-url="{% url 'user:team-new' %}" title="{% trans 'Add new team' %}">
{% fa5_icon 'plus' %}
{% trans 'New' %}