From: Benny Baumann <BenBE1987@gmx.net>
Date: Thu, 8 Feb 2018 19:48:29 +0000 (+0100)
Subject: Merge "chg: extract url to links.txt"
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=be0c267ced95d9e08e179ad222439198b0176ac6;hp=ce95db23bb9c9d7573ecf565220235f2692f7138

Merge "chg: extract url to links.txt"
---

diff --git a/links.txt b/links.txt
index e68f4e90..ec99a4d8 100644
--- a/links.txt
+++ b/links.txt
@@ -15,3 +15,4 @@
 /ttp/country
 /blog
 /imprint
+/isocode http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm
diff --git a/src/club/wpia/gigi/pages/orga/CreateOrgForm.templ b/src/club/wpia/gigi/pages/orga/CreateOrgForm.templ
index 7fdd98de..865f8dde 100644
--- a/src/club/wpia/gigi/pages/orga/CreateOrgForm.templ
+++ b/src/club/wpia/gigi/pages/orga/CreateOrgForm.templ
@@ -28,7 +28,7 @@
     <td><?=_Country?>:</td>
     <td>
       <?=$C?>
-      <?=_(2 letter !'<a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">'ISO code!'</a>')?>
+      <?=_(2 letter !(/isocode)ISO code!'</a>')?>
     </td>
   </tr>
   <? if($edit) { ?>
diff --git a/src/club/wpia/gigi/pages/orga/ViewOrgPage.java b/src/club/wpia/gigi/pages/orga/ViewOrgPage.java
index d676c1de..909f9efe 100644
--- a/src/club/wpia/gigi/pages/orga/ViewOrgPage.java
+++ b/src/club/wpia/gigi/pages/orga/ViewOrgPage.java
@@ -13,11 +13,12 @@ import club.wpia.gigi.dbObjects.Organisation;
 import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.localisation.Language;
 import club.wpia.gigi.output.template.Form;
+import club.wpia.gigi.output.template.Form.CSRFException;
 import club.wpia.gigi.output.template.IterableDataset;
 import club.wpia.gigi.output.template.Template;
-import club.wpia.gigi.output.template.Form.CSRFException;
 import club.wpia.gigi.pages.LoginPage;
 import club.wpia.gigi.pages.ManagedMultiFormPage;
+import club.wpia.gigi.pages.Page;
 import club.wpia.gigi.pages.account.domain.DomainManagementForm;
 import club.wpia.gigi.util.AuthorizationContext;
 
@@ -91,7 +92,7 @@ public class ViewOrgPage extends ManagedMultiFormPage {
             resp.sendError(404);
             return;
         }
-        HashMap<String, Object> vars = new HashMap<>();
+        Map<String, Object> vars = Page.getDefaultVars(req);
         if (orgAss) {
             vars.put("editForm", new CreateOrgForm(req, o));
             vars.put("affForm", new AffiliationForm(req, o));