mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-05 09:26:27 +00:00
Fix #106
This commit is contained in:
parent
d911452ae0
commit
2337a24997
4 changed files with 9 additions and 5 deletions
|
@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
<form class="form" method="post">
|
<form class="form" method="post" enctype="multipart/form-data">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% if preferenceform %}
|
{% if preferenceform %}
|
||||||
{% bootstrap_form preferenceform %}
|
{% bootstrap_form preferenceform %}
|
||||||
|
|
|
@ -119,7 +119,7 @@ def edit_options(request, section):
|
||||||
@can_create(Service)
|
@can_create(Service)
|
||||||
def add_service(request):
|
def add_service(request):
|
||||||
"""Ajout d'un service de la page d'accueil"""
|
"""Ajout d'un service de la page d'accueil"""
|
||||||
service = ServiceForm(request.POST or None)
|
service = ServiceForm(request.POST or None, request.FILES or None)
|
||||||
if service.is_valid():
|
if service.is_valid():
|
||||||
with transaction.atomic(), reversion.create_revision():
|
with transaction.atomic(), reversion.create_revision():
|
||||||
service.save()
|
service.save()
|
||||||
|
@ -138,7 +138,7 @@ def add_service(request):
|
||||||
@can_edit(Service)
|
@can_edit(Service)
|
||||||
def edit_service(request, service_instance, **_kwargs):
|
def edit_service(request, service_instance, **_kwargs):
|
||||||
"""Edition des services affichés sur la page d'accueil"""
|
"""Edition des services affichés sur la page d'accueil"""
|
||||||
service = ServiceForm(request.POST or None, instance=service_instance)
|
service = ServiceForm(request.POST or None, request.FILES or None,instance=service_instance)
|
||||||
if service.is_valid():
|
if service.is_valid():
|
||||||
with transaction.atomic(), reversion.create_revision():
|
with transaction.atomic(), reversion.create_revision():
|
||||||
service.save()
|
service.save()
|
||||||
|
|
|
@ -155,7 +155,11 @@ BOOTSTRAP_BASE_URL = '/static/bootstrap/'
|
||||||
STATICFILES_DIRS = (
|
STATICFILES_DIRS = (
|
||||||
os.path.join(BASE_DIR, 'static').replace('\\', '/'),
|
os.path.join(BASE_DIR, 'static').replace('\\', '/'),
|
||||||
)
|
)
|
||||||
# Directory where the static files serverd by the server are stored
|
|
||||||
|
MEDIA_ROOT = '/var/www/re2o/media'
|
||||||
|
|
||||||
|
MEDIA_URL = '/media/'
|
||||||
|
|
||||||
STATIC_ROOT = os.path.join(BASE_DIR, 'static_files')
|
STATIC_ROOT = os.path.join(BASE_DIR, 'static_files')
|
||||||
# The URL to access the static files
|
# The URL to access the static files
|
||||||
STATIC_URL = '/static/'
|
STATIC_URL = '/static/'
|
||||||
|
|
|
@ -37,7 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
{% for service in service_list %}
|
{% for service in service_list %}
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="thumbnail">
|
<div class="thumbnail">
|
||||||
<a href="{{ service.url }}"><img src="{% static service.image %}" alt="{{ service.name }}"></a>
|
<a href="{{ service.url }}"><img src="{{ service.image.url }}" alt="{{ service.name }}"></a>
|
||||||
<div class="caption">
|
<div class="caption">
|
||||||
<h3>{{ service.name }}</h3>
|
<h3>{{ service.name }}</h3>
|
||||||
<p>{{ service.description }}</p>
|
<p>{{ service.description }}</p>
|
||||||
|
|
Loading…
Reference in a new issue