71 changes: 35 additions & 36 deletions geonode/layers/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,6 @@ def layer_metadata(
la for la in default_map_config(request)[1] if la.ows_url is None]

if request.method == "POST":

if layer.metadata_uploaded_preserve: # layer metadata cannot be edited
out = {
'success': False,
Expand Down Expand Up @@ -979,8 +978,8 @@ def layer_metadata(
request.POST["category_choice_field"]) if "category_choice_field" in request.POST and
request.POST["category_choice_field"] else None)
tkeywords_form = TKeywordForm(
request.POST,
prefix="tkeywords")
prefix="tkeywords",
initial={'tkeywords': request.POST.getlist('tkeywords-tkeywords')})
else:
layer_form = LayerForm(instance=layer, prefix="resource")
attribute_form = layer_attribute_set(
Expand All @@ -991,35 +990,35 @@ def layer_metadata(
prefix="category_choice_field",
initial=topic_category.id if topic_category else None)

# Keywords from THESAURI management
# Keywords from THESAURUS management
layer_tkeywords = layer.tkeywords.all()
tkeywords_list = ''
lang = 'en' # TODO: use user's language
if layer_tkeywords and len(layer_tkeywords) > 0:
tkeywords_ids = layer_tkeywords.values_list('id', flat=True)
if hasattr(settings, 'THESAURI'):
for el in settings.THESAURI:
thesaurus_name = el['name']
try:
t = Thesaurus.objects.get(identifier=thesaurus_name)
for tk in t.thesaurus.filter(pk__in=tkeywords_ids):
tkl = tk.keyword.filter(lang=lang)
if len(tkl) > 0:
tkl_ids = ",".join(
map(str, tkl.values_list('id', flat=True)))
tkeywords_list += "," + \
tkl_ids if len(
tkeywords_list) > 0 else tkl_ids
except BaseException:
tb = traceback.format_exc()
logger.error(tb)
if hasattr(settings, 'THESAURUS') and settings.THESAURUS:
el = settings.THESAURUS
thesaurus_name = el['name']
try:
t = Thesaurus.objects.get(identifier=thesaurus_name)
for tk in t.thesaurus.filter(pk__in=tkeywords_ids):
tkl = tk.keyword.filter(lang=lang)
if len(tkl) > 0:
tkl_ids = ",".join(
map(str, tkl.values_list('id', flat=True)))
tkeywords_list += "," + \
tkl_ids if len(
tkeywords_list) > 0 else tkl_ids
except BaseException:
tb = traceback.format_exc()
logger.error(tb)

tkeywords_form = TKeywordForm(
prefix="tkeywords",
initial={'tkeywords': tkeywords_list})

if request.method == "POST" and layer_form.is_valid() and attribute_form.is_valid(
) and category_form.is_valid() and tkeywords_form.is_valid():
) and category_form.is_valid():
new_poc = layer_form.cleaned_data['poc']
new_author = layer_form.cleaned_data['metadata_author']

Expand Down Expand Up @@ -1106,32 +1105,32 @@ def layer_metadata(
message = layer.alternate

try:
# Keywords from THESAURI management
# Keywords from THESAURUS management
tkeywords_to_add = []
tkeywords_cleaned = tkeywords_form.clean()
if tkeywords_cleaned and len(tkeywords_cleaned) > 0:
tkeywords_ids = []
for i, val in enumerate(tkeywords_cleaned):
try:
cleaned_data = [value for key, value in tkeywords_cleaned[i].items(
) if 'tkeywords-tkeywords' in key.lower() and 'autocomplete' not in key.lower()]
) if 'tkeywords' in key.lower() and 'autocomplete' not in key.lower()]
tkeywords_ids.extend(map(int, cleaned_data[0]))
except BaseException:
pass

if hasattr(settings, 'THESAURI'):
for el in settings.THESAURI:
thesaurus_name = el['name']
try:
t = Thesaurus.objects.get(
identifier=thesaurus_name)
for tk in t.thesaurus.all():
tkl = tk.keyword.filter(pk__in=tkeywords_ids)
if len(tkl) > 0:
tkeywords_to_add.append(tkl[0].keyword_id)
except BaseException:
tb = traceback.format_exc()
logger.error(tb)
if hasattr(settings, 'THESAURUS') and settings.THESAURUS:
el = settings.THESAURUS
thesaurus_name = el['name']
try:
t = Thesaurus.objects.get(
identifier=thesaurus_name)
for tk in t.thesaurus.all():
tkl = tk.keyword.filter(pk__in=tkeywords_ids)
if len(tkl) > 0:
tkeywords_to_add.append(tkl[0].keyword_id)
except BaseException:
tb = traceback.format_exc()
logger.error(tb)

layer.tkeywords.add(*tkeywords_to_add)
register_event(request, 'change_metadata', layer)
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/af/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ msgid "Category is required."
msgstr "Kategorie word vereis."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/al/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,11 +159,11 @@ msgid "Category is required."
msgstr ""

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/am/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ msgid "Category is required."
msgstr ""

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/ar/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ msgid "Category is required."
msgstr "الفئة مطلوبة."

#: geonode/base/forms.py:288
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr "كلمات رئيسية من قاموس المرادفات"

#: geonode/base/forms.py:290
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr "قائمة الكلمات الرئيسية من قاموس المرادفات"

#: geonode/base/forms.py:321 geonode/base/models.py:537
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/bg_BG/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ msgid "Category is required."
msgstr "Изисква се категория"

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/bn/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,11 +184,11 @@ msgid "Category is required."
msgstr "শ্রেণী প্রয়োজন"

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/de/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ msgid "Category is required."
msgstr "Kategorie erforderlich."

#: geonode/base/forms.py:288
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr "Schlüsselwörter des Thesauri"

#: geonode/base/forms.py:290
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr "Liste an Schlüsselwörter des Thesauri"

#: geonode/base/forms.py:321 geonode/base/models.py:537
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/el/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@ msgid "Category is required."
msgstr "Απαιτείται Κατηγορία."

#: geonode/base/forms.py:288
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr "Λέξεις Κλειδιά από Λεξικό"

#: geonode/base/forms.py:290
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr "Λίστα λέξεων κλειδιών από Λεξικό"

#: geonode/base/forms.py:321 geonode/base/models.py:537
Expand Down
8 changes: 4 additions & 4 deletions geonode/locale/en/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,12 +177,12 @@ msgid "Category is required."
msgstr "Category is required."

#: geonode/base/forms.py:292
msgid "Keywords from Thesauri"
msgstr "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr "Keywords from Thesaurus"

#: geonode/base/forms.py:294
msgid "List of keywords from Thesauri"
msgstr "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr "List of keywords from Thesaurus"

#: geonode/base/forms.py:325 geonode/base/models.py:539
#: geonode/base/templates/base/_resourcebase_contact_snippet.html:10
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/es/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,11 @@ msgid "Category is required."
msgstr "Categoría requerida."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/fa/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ msgid "Category is required."
msgstr "رده مورد نیاز است."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/fa_IR/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ msgid "Category is required."
msgstr "رده مورد نیاز است."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/fi/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ msgid "Category is required."
msgstr "Luokka on pakollinen."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/fil/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ msgid "Category is required."
msgstr ""

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/fr/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,11 @@ msgid "Category is required."
msgstr "Une catégorie est requise."

#: geonode/base/forms.py:288
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr "Mots-clés du Thésaurus"

#: geonode/base/forms.py:290
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr "Liste des mots-clés du Thésaurus"

#: geonode/base/forms.py:321 geonode/base/models.py:537
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/hu/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ msgid "Category is required."
msgstr "Kategória szükséges."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/id/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ msgid "Category is required."
msgstr "Kategori diperlukan."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/it/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,11 @@ msgid "Category is required."
msgstr "È necessario categoria."

#: geonode/base/forms.py:292
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr "Parole chiave dai Thesauri"

#: geonode/base/forms.py:294
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr "Elenco di parole chiave dai Thesauri"

#: geonode/base/forms.py:325 geonode/base/models.py:539
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/ja/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ msgid "Category is required."
msgstr "カテゴリが必要です。"

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/ka/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ msgid "Category is required."
msgstr "კატეგორია უნდა იყოს მითითებული."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/km/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ msgid "Category is required."
msgstr "ប្រភេទ​ត្រូវ​បាន​ទាមទារ​។"

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/ko/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,11 @@ msgid "Category is required."
msgstr "카테고리가 필요합니다."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/lt/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ msgid "Category is required."
msgstr ""

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/ne/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ msgid "Category is required."
msgstr ""

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/nl_NL/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ msgid "Category is required."
msgstr "Categorie is verplicht."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/no/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ msgid "Category is required."
msgstr "Kategori er påkrevd."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/pl/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ msgid "Category is required."
msgstr "Wymagana jest kategoria."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/pt/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,11 @@ msgid "Category is required."
msgstr "Categoria é necessária."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/pt_BR/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,11 @@ msgid "Category is required."
msgstr "Categoria é necessária."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/ro/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ msgid "Category is required."
msgstr "Este necesară categorie."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/ru/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@ msgid "Category is required."
msgstr "Категория должна быть указана."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/si/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,11 @@ msgid "Category is required."
msgstr "ප්රවර්ගය අවශ්ය වේ."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/sq/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ msgid "Category is required."
msgstr ""

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/sv/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ msgid "Category is required."
msgstr "Kategori krävs."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/sw/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ msgid "Category is required."
msgstr "Kundi linahitajika"

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/ta/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ msgid "Category is required."
msgstr "வகை தேவைப்படுகிறது."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/th/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ msgid "Category is required."
msgstr "หมวดเป็นสิ่งที่จำเป็น"

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/tl/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,11 @@ msgid "Category is required."
msgstr ""

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/uk/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,11 @@ msgid "Category is required."
msgstr "Категорія вимагається."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/vi/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@ msgid "Category is required."
msgstr "Danh mục được yêu cầu."

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr ""

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
4 changes: 2 additions & 2 deletions geonode/locale/zh/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ msgid "Category is required."
msgstr "类别是必需的。"

#: geonode/base/forms.py:232
msgid "Keywords from Thesauri"
msgid "Keywords from Thesaurus"
msgstr "来自 Thesauri 的关键词"

#: geonode/base/forms.py:234
msgid "List of keywords from Thesauri"
msgid "List of keywords from Thesaurus"
msgstr "来自 Thesauri 的关键词列表"

#: geonode/base/forms.py:255 geonode/base/models.py:456
Expand Down
3 changes: 3 additions & 0 deletions geonode/maps/templates/layouts/map_panels.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,14 @@
</div>
<div class="col-lg-5">
<div class="col-lg-12">
<span><label for="{{ layer_form.date_type|id }}">{{ layer_form.keywords.label }}</label></span>
{{ map_form.keywords }}
</div>
{% if THESAURI_FILTERS %}
<div class="col-lg-12 thesauri_keywords">
{{ tkeywords_form }}
</div>
{% endif %}
<div class="col-lg-6 col-xs-12">
<span><label for="{{ map_form.date_type|id }}">{{ map_form.date_type.label }}</label></span>
<!--<p class="xxs-font-size">(Identification of when a given event occurred)</p>-->
Expand Down
5 changes: 2 additions & 3 deletions geonode/settings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1796,11 +1796,10 @@ def get_geonode_catalogue_service():
from django.contrib.gis.geos import GEOSGeometry # flake8: noqa

# Keywords thesauri
# e.g. THESAURI = [{'name':'inspire_themes', 'required':True, 'filter':True}, {'name':'inspire_concepts', 'filter':True}, ]
# e.g. THESAURUS = {'name':'inspire_themes', 'required':True, 'filter':True}
# Required: (boolean, optional, default false) mandatory while editing metadata (not implemented yet)
# Filter: (boolean, optional, default false) a filter option on that thesaurus will appear in the main search page
# THESAURI = [{'name':'inspire_themes', 'required':False, 'filter':True}]
THESAURI = []
# THESAURUS = {'name': 'inspire_themes', 'required': True, 'filter': True}

# Each uploaded Layer must be approved by an Admin before becoming visible
ADMIN_MODERATE_UPLOADS = ast.literal_eval(os.environ.get('ADMIN_MODERATE_UPLOADS', 'False'))
Expand Down
12 changes: 10 additions & 2 deletions geonode/templates/metadata_form_js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,10 +595,18 @@
errors += "</ul>";
$("#preview_errorDialog .modal-body").html(errors);
} else {
$("#preview_errorDialog .modal-body").html(xhr.responseText);
if (xhr.responseText.indexOf('<!DOCTYPE html>') >= 0) {
$("#preview_errorDialog .modal-body").html("Unknown Error Occurred.");
} else {
$("#preview_errorDialog .modal-body").html(xhr.responseText);
}
}
} catch(err) {
$("#preview_errorDialog .modal-body").html(xhr.responseText);
if (xhr.responseText.indexOf('<!DOCTYPE html>') >= 0) {
$("#preview_errorDialog .modal-body").html(err);
} else {
$("#preview_errorDialog .modal-body").html(xhr.responseText);
}
}
$('#preview_errorDialog').modal();
metadata_update_done = false;
Expand Down