Settings: Display overridden instead of overrided
Signed-off-by: Rob de Canha-Knight <rob@rob-knight.com>
This commit is contained in:
@@ -50,7 +50,7 @@ class FormOptions(object):
|
|||||||
determined in the following order: as passed via keyword
|
determined in the following order: as passed via keyword
|
||||||
arguments during form intialization, as form get_... method or
|
arguments during form intialization, as form get_... method or
|
||||||
finally as static Meta options. This is to allow a form with
|
finally as static Meta options. This is to allow a form with
|
||||||
Meta options or method to be overrided at initialization
|
Meta options or method to be overridden at initialization
|
||||||
and increase the usability of a single class.
|
and increase the usability of a single class.
|
||||||
"""
|
"""
|
||||||
for name, default_value in self.option_definitions.items():
|
for name, default_value in self.option_definitions.items():
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class SmartSettingsApp(MayanAppConfig):
|
|||||||
attribute='serialized_value', label=_('Value'), source=Setting
|
attribute='serialized_value', label=_('Value'), source=Setting
|
||||||
)
|
)
|
||||||
SourceColumn(
|
SourceColumn(
|
||||||
attribute='is_overrided', source=Setting, widget=TwoStateWidget
|
attribute='is_overridden', source=Setting, widget=TwoStateWidget
|
||||||
)
|
)
|
||||||
|
|
||||||
menu_object.bind_links(
|
menu_object.bind_links(
|
||||||
|
|||||||
@@ -344,12 +344,12 @@ class Setting(object):
|
|||||||
def invalidate_cache(self):
|
def invalidate_cache(self):
|
||||||
self.loaded = False
|
self.loaded = False
|
||||||
|
|
||||||
def is_overrided(self):
|
def is_overridden(self):
|
||||||
return self.environment_variable
|
return self.environment_variable
|
||||||
|
|
||||||
is_overrided.short_description = _('Overrided')
|
is_overridden.short_description = _('Overridden')
|
||||||
is_overrided.help_text = _(
|
is_overridden.help_text = _(
|
||||||
'Is this settings being overrided by an environment variable?'
|
'Is this settings being overridden by an environment variable?'
|
||||||
)
|
)
|
||||||
|
|
||||||
def migrate(self):
|
def migrate(self):
|
||||||
|
|||||||
@@ -34,11 +34,11 @@ msgid "Value"
|
|||||||
msgstr "قيمة"
|
msgstr "قيمة"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "Стойност"
|
msgstr "Стойност"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr "Отменено с друга настройка"
|
msgstr "Отменено с друга настройка"
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr "Отменят ли се тези настройки с променлива на средата?"
|
msgstr "Отменят ли се тези настройки с променлива на средата?"
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "Vrijednost"
|
msgstr "Vrijednost"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "Hodnota"
|
msgstr "Hodnota"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "Værdi"
|
msgstr "Værdi"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -37,11 +37,11 @@ msgid "Value"
|
|||||||
msgstr "Wert"
|
msgstr "Wert"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -34,11 +34,11 @@ msgid "Value"
|
|||||||
msgstr "Τιμή"
|
msgstr "Τιμή"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -34,11 +34,11 @@ msgid "Value"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -37,11 +37,11 @@ msgid "Value"
|
|||||||
msgstr "Valor"
|
msgstr "Valor"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr "Anulado"
|
msgstr "Anulado"
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr "¿Esta configuración está siendo anulada por una variable de entorno?"
|
msgstr "¿Esta configuración está siendo anulada por una variable de entorno?"
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ msgid "Value"
|
|||||||
msgstr "مقدار"
|
msgstr "مقدار"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -38,11 +38,11 @@ msgid "Value"
|
|||||||
msgstr "Valeur"
|
msgstr "Valeur"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "Érték"
|
msgstr "Érték"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -34,11 +34,11 @@ msgid "Value"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "Valore"
|
msgstr "Valore"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "Vērtība"
|
msgstr "Vērtība"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "Waarde"
|
msgstr "Waarde"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -38,11 +38,11 @@ msgid "Value"
|
|||||||
msgstr "Wartość"
|
msgstr "Wartość"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -34,11 +34,11 @@ msgid "Value"
|
|||||||
msgstr "Valor"
|
msgstr "Valor"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -37,11 +37,11 @@ msgid "Value"
|
|||||||
msgstr "Valor"
|
msgstr "Valor"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "Valoare"
|
msgstr "Valoare"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "Значение"
|
msgstr "Значение"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -34,11 +34,11 @@ msgid "Value"
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -36,11 +36,11 @@ msgid "Value"
|
|||||||
msgstr "Değer"
|
msgstr "Değer"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -34,11 +34,11 @@ msgid "Value"
|
|||||||
msgstr "Giá trị"
|
msgstr "Giá trị"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
@@ -35,11 +35,11 @@ msgid "Value"
|
|||||||
msgstr "值"
|
msgstr "值"
|
||||||
|
|
||||||
#: classes.py:350
|
#: classes.py:350
|
||||||
msgid "Overrided"
|
msgid "Overridden"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: classes.py:352
|
#: classes.py:352
|
||||||
msgid "Is this settings being overrided by an environment variable?"
|
msgid "Is this settings being overridden by an environment variable?"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: forms.py:14
|
#: forms.py:14
|
||||||
|
|||||||
Reference in New Issue
Block a user