From 21457f24a4655c5a20ba9d91bcae9fa14abc689d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 11 Aug 2011 17:23:34 +0200
Subject: [PATCH] Added paths for dossiers and ministries

---
 tabellio/config/controlpanel.pt | 38 ++++++++++++++++++++++++++++++---
 tabellio/config/controlpanel.py |  4 ++++
 tabellio/config/interfaces.py   |  8 +++++++
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/tabellio/config/controlpanel.pt b/tabellio/config/controlpanel.pt
index 558c0d2..c0fd8c2 100644
--- a/tabellio/config/controlpanel.pt
+++ b/tabellio/config/controlpanel.pt
@@ -37,7 +37,7 @@
 
                 <div
                     tal:define="error errors/deputiesPath | nothing;
-                                deputiesPath python:request.get('deputies', view.settings.deputiesPath)"
+                                deputiesPath python:request.get('deputiesPath', view.settings.deputiesPath)"
                     tal:attributes="class python:'field error' if error else 'field'">
 
                     <label for="deputiesPath" i18n:translate="label_deputies_path">Deputies</label>
@@ -51,9 +51,25 @@
                         />
                 </div>
 
+                <div
+                    tal:define="error errors/ministriesPath | nothing;
+                                ministriesPath python:request.get('ministriesPath', view.settings.ministriesPath)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="ministriesPath" i18n:translate="label_ministries_path">Ministries</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="ministriesPath"
+                        id="ministriesPath"
+                        type="text"
+                        size="80"
+                        tal:attributes="value ministriesPath"
+                        />
+                </div>
+
                 <div
                     tal:define="error errors/documentsPath | nothing;
-                                documentsPath python:request.get('deputies', view.settings.documentsPath)"
+                                documentsPath python:request.get('documentsPath', view.settings.documentsPath)"
                     tal:attributes="class python:'field error' if error else 'field'">
                     <label for="documentsPath" i18n:translate="label_documents_path">Documents</label>
                     <div tal:content="error" tal:condition="error" />
@@ -67,9 +83,25 @@
 
                 </div>
 
+                <div
+                    tal:define="error errors/dossiersPath | nothing;
+                                dossiersPath python:request.get('dossiersPath', view.settings.dossiersPath)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+                    <label for="dossiersPath" i18n:translate="label_dossiers_path">Dossiers</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="dossiersPath"
+                        id="dossiersPath"
+                        type="text"
+                        size="80"
+                        tal:attributes="value dossiersPath"
+                        />
+
+                </div>
+
                 <div
                     tal:define="error errors/polgroupsPath | nothing;
-                                polgroupsPath python:request.get('polgroups', view.settings.polgroupsPath)"
+                                polgroupsPath python:request.get('polgroupsPath', view.settings.polgroupsPath)"
                     tal:attributes="class python:'field error' if error else 'field'">
 
                     <label for="polgroupsPath" i18n:translate="label_polgroups_path">Political Groups</label>
diff --git a/tabellio/config/controlpanel.py b/tabellio/config/controlpanel.py
index f268315..47db1cd 100644
--- a/tabellio/config/controlpanel.py
+++ b/tabellio/config/controlpanel.py
@@ -44,12 +44,16 @@ class TabellioControlpanel(BrowserView):
             submitted = True
 
             deputies_path = form.get('deputiesPath')
+            ministries_path = form.get('ministriesPath')
             documents_path = form.get('documentsPath')
+            dossiers_path = form.get('dossiersPath')
             polgroups_path = form.get('polgroupsPath')
 
             if not self.errors:
                 self.settings.deputiesPath = deputies_path
+                self.settings.ministriesPath = ministries_path
                 self.settings.documentsPath = documents_path
+                self.settings.dossiersPath = dossiers_path
                 self.settings.polgroupsPath = polgroups_path
 
         if submitted and not self.errors:
diff --git a/tabellio/config/interfaces.py b/tabellio/config/interfaces.py
index c283577..9fc8dc8 100644
--- a/tabellio/config/interfaces.py
+++ b/tabellio/config/interfaces.py
@@ -15,6 +15,14 @@ class ITabellioSettings(Interface):
         title=_('documents_path', 'Documents Path'),
         required=False)
 
+    dossiersPath = schema.TextLine(
+        title=_('dossiers_path', 'Dossiers Path'),
+        required=False)
+
+    ministriesPath = schema.TextLine(
+        title=_('ministries_path', 'Ministries Path'),
+        required=False)
+
     polgroupsPath = schema.TextLine(
         title=_('polgroups_path', 'Political Groups Path'),
         required=False)