Merge "chg: extract url to links.txt"

diff --git a/links.txt b/links.txt
index e68f4e90053cb94d2d367c7b8d0760ba638cf6ba..ec99a4d8e455d27067a107abd99aac332af9e05d 100644 (file)
--- 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 7fdd98deeb63be2e4a8d20c016d06dc11adc771f..865f8ddead483b0e570194c21a44871476354c2a 100644 (file)
--- 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 d676c1de567977e9fa08a17b2a41258d5bb91a2c..909f9efe62168bd22fe422e0d67a70b4c4dcefa3 100644 (file)
--- 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));