mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-05 01:16:27 +00:00
Variable globale pour le reminder
This commit is contained in:
parent
650ca56c2f
commit
0f4c7fa7e9
4 changed files with 28 additions and 6 deletions
|
@ -407,9 +407,8 @@ class GeneralOptionSerializer(NamespacedHMSerializer):
|
||||||
fields = ('general_message_fr', 'general_message_en',
|
fields = ('general_message_fr', 'general_message_en',
|
||||||
'search_display_page', 'pagination_number',
|
'search_display_page', 'pagination_number',
|
||||||
'pagination_large_number', 'req_expire_hrs',
|
'pagination_large_number', 'req_expire_hrs',
|
||||||
'site_name', 'email_from', 'GTU_sum_up',
|
'site_name', 'main_site_url', 'email_from',
|
||||||
'GTU')
|
'GTU_sum_up', 'GTU')
|
||||||
|
|
||||||
|
|
||||||
class HomeServiceSerializer(NamespacedHMSerializer):
|
class HomeServiceSerializer(NamespacedHMSerializer):
|
||||||
"""Serialize `preferences.models.Service` objects.
|
"""Serialize `preferences.models.Service` objects.
|
||||||
|
|
20
preferences/migrations/0055_generaloption_main_site_url.py
Normal file
20
preferences/migrations/0055_generaloption_main_site_url.py
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.10.7 on 2018-11-14 16:46
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('preferences', '0054_merge_20181025_1258'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='generaloption',
|
||||||
|
name='main_site_url',
|
||||||
|
field=models.URLField(default='http://re2o.example.org', max_length=255),
|
||||||
|
),
|
||||||
|
]
|
|
@ -431,6 +431,7 @@ class GeneralOption(AclMixin, PreferencesModel):
|
||||||
req_expire_hrs = models.IntegerField(default=48)
|
req_expire_hrs = models.IntegerField(default=48)
|
||||||
site_name = models.CharField(max_length=32, default="Re2o")
|
site_name = models.CharField(max_length=32, default="Re2o")
|
||||||
email_from = models.EmailField(default="www-data@example.com")
|
email_from = models.EmailField(default="www-data@example.com")
|
||||||
|
main_site_url = models.URLField(max_length=255, default="http://re2o.example.org")
|
||||||
GTU_sum_up = models.TextField(
|
GTU_sum_up = models.TextField(
|
||||||
default="",
|
default="",
|
||||||
blank=True,
|
blank=True,
|
||||||
|
|
|
@ -224,10 +224,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
<tr>
|
<tr>
|
||||||
<th>{% trans "General message displayed on the website" %}</th>
|
<th>{% trans "General message displayed on the website" %}</th>
|
||||||
<td>{{ generaloptions.general_message }}</td>
|
<td>{{ generaloptions.general_message }}</td>
|
||||||
<th>{% trans "Summary of the General Terms of Use" %}</th>
|
<th>{% trans "Main site url" %}</th>
|
||||||
<td>{{ generaloptions.GTU_sum_up }}</td>
|
<td>{{ generaloptions.main_site_url }}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
<th>{% trans "Summary of the General Terms of Use" %}</th>
|
||||||
|
<td>{{ generaloptions.GTU_sum_up }}</td>
|
||||||
<th>{% trans "General Terms of Use" %}</th>
|
<th>{% trans "General Terms of Use" %}</th>
|
||||||
<td>{{ generaloptions.GTU }}</th>
|
<td>{{ generaloptions.GTU }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
Loading…
Reference in a new issue