From bbf43a3ba16702c9f2ba59694c15e8718e791d4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 9 Aug 2011 19:01:54 +0200
Subject: [PATCH] making polgroup location a setting

---
 tabellio/config/.controlpanel.pt.swp | Bin 12288 -> 0 bytes
 tabellio/config/configure.zcml       |   9 +++++++++
 tabellio/config/controlpanel.pt      |  16 ++++++++++++++++
 tabellio/config/controlpanel.py      |   2 ++
 tabellio/config/interfaces.py        |   4 ++++
 tabellio/config/upgrade.py           |   9 +++++++++
 6 files changed, 40 insertions(+)
 delete mode 100644 tabellio/config/.controlpanel.pt.swp
 create mode 100644 tabellio/config/upgrade.py

diff --git a/tabellio/config/.controlpanel.pt.swp b/tabellio/config/.controlpanel.pt.swp
deleted file mode 100644
index a133c38013b71ac677e6c07cd13bd93916991c57..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2?Tg$*9LJ}v^{KWMt%!&vjmlMUle^vv+ckT%oRn6op1q#6uh!Yk>~3r}iJ8gW
z^=heT1;M^i5%fiU`~#Hso#MkgK@<^0#TUL46ns<P3w~#k>}IpOy=%duWdffjnfzwv
zH{bcq!}g{z`P9M3jEAggg6md7E*{zU_?=(Qle>2k(u$cYlUKU}wjx%uk>73JjHzgL
z?8pxTRuQzpeBTT06))g|22E!3xM}CfRx=D*Uc2{hXYaU)IP@bLFyD&SRPkDz(>7Xx
zYgvIrv?{wdlj&Vkld_rjnmdf!Z(F#QTddor70?Q31+)TM0j+>mKr5gX&<d0k5Yakv
z8fojZ^k=jCy3##+)i<qxRzNGD70?Q31+)TM0j+>mKr5gX&<bb;{)Y-s{DuDv{5~N6
z0|0;j&wu}awUv<9!7*ThZQzG3gnSA<0T;k|@G>|9>fjEr4QvE|Y$oIb5P^B{C^!iA
zflXjNSO<Q+g^>5b3*a>9f;q4YYyjVFBIF%#4!i<p!7n!x@)CFvYzIHzM9630HP8mL
zU<df^Mnb*@7r=RN4jcu4-ayEkzyiNtPsq36J&=GWferrJNXSp%NALys9J~RR!C`P0
zxOg2Q-+;HlTi_Hp3hoDgZ$Mt~Avg<O1=C;`*beRiTfr9aJ+%KAd<5PFXTeFZ0(@{B
zQ1A>m2A&3UK=s*wBIX>&u{)yc&k)CMgzkwMf(O@I#NEJ!XM9qR*{fT4O_QRT-glXR
z%d#w@9<qNNnDi1H*EKx1X0|-$yPSziC^{@Q`-M2J7%=czn+0x#x{LCpiEGY0Au|}r
zD!ic0;i4!OZ@a@Tw!*kuu*rRMydX-1A*f%CS>)3utC?KHNmC>-Gvsj<wk+(uduf6i
z1K~BP2xEKT%{1&$1*a0`^_1`4)b5~4g^0aIA{eiki_}k;DynRnzblKHIV&abO_C><
z?@ga_l$W_a-Y%eBv{lMt!37Zp)@mh-6OmLWX>>g?y4+OFen*#myYg1g(?vGAPFcs5
zxA{<r9`(Y2U%G-dH@)0q2Lma0Pij4z9)RKqb~0pJ7<J`u@*QC|Dp{t<_#KKS!ws8B
z7g5XSsOXGWk9#ZV*WHujEz;)8p)lS?4(K&jn1<dOjI($e)oLZIY_<yYK-5eY$6;(L
zDUjxRvRiwpW3+R8d5+CM&y<}vRIG}a2Hd9t`Y6kK&*^$3HJy1Rm)NnD!RRh3caMr!
zBRU~EVNjh=)1aZ;pD?^u`eZPlGb8;rQJ5M>X(7{kj>*2xi;mfI3FE?QGqH2RWtiza
z#wQ*$7Cp9P<+G<XkoAGlJuF+`vX&P>3FT?(CASAM8_yd7=5ox*50kQ^vcty4eAzgE
zAJc8}b6Hb0JsNo<uUf=sqF%bbEZ|qQy}I#UbZ1<+XEu4XXRp0rCwWH|@8zEPH=@1Z
z`(*}uA?IbsdLi%Shx*VE;%Xe)YB<RSp{SvJF6&5}a!NC@L2WM_J~TX5vz3qqwBfUb
zzz?ZA7l(qWti$GAhA9XWcNFpwQ+pb=4a&XdU{*&iW&OcCw4Y0}^jkD$KbM*1Yj9~l
zCna!PKVLo5ChbSXM`)vgDJEY+9lNmoT)?D>35ct$8%`P<>Zq|HLYaUQ$#PeR{Oas-
zx<l>lOdXr{J(iU(L^9vJCzvtML=q91D6i2=LlV_RSXalR>zG@UsL-Y5uI$9DWniC)
zW>oJx8HF(n>PhUMN{?69<)Q}fG3;<qy03lKyS^73uS7J)(w=^Es3A+NnP$IJ%1(9|
zbx~bCKcX#tRJ&($CKsg80iCH-3#T)ccR)VV@AqOZ4y2`_KD7`dj<7(qJm0TyKg41j
z!5uD}0nL3T>RsvuvcsJ07e-G;H<X`{K^`m56iZ7>IIDDNGY)&3SvxINW~d9+#dcjV
zTbXd&xWI1+A`A9u(8e+q<iag?{eV}cAT_fiL{znHBv~tA#H=uG+cM61guOqvrO{wE
w<;<%2l+|EHD6(oc*qFqTzrGCRWG}<g(vr0_t-PDsvuBUJENx6_RPDF!A7rr@%m4rY

diff --git a/tabellio/config/configure.zcml b/tabellio/config/configure.zcml
index 73af58c..d1aaab2 100644
--- a/tabellio/config/configure.zcml
+++ b/tabellio/config/configure.zcml
@@ -16,6 +16,15 @@
       provides="Products.GenericSetup.interfaces.EXTENSION"
       />
 
+  <genericsetup:upgradeStep
+      title="Update registry"
+      source="*"
+      destination="1000"
+      handler=".upgrade.update_registry"
+      sortkey="1"
+      profile="tabellio.config:default"
+      />
+
   <browser:resource
       name="tabellio.config.png"
       image="icon.png"
diff --git a/tabellio/config/controlpanel.pt b/tabellio/config/controlpanel.pt
index 8f27766..558c0d2 100644
--- a/tabellio/config/controlpanel.pt
+++ b/tabellio/config/controlpanel.pt
@@ -67,6 +67,22 @@
 
                 </div>
 
+                <div
+                    tal:define="error errors/polgroupsPath | nothing;
+                                polgroupsPath python:request.get('polgroups', view.settings.polgroupsPath)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="polgroupsPath" i18n:translate="label_polgroups_path">Political Groups</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="polgroupsPath"
+                        id="polgroupsPath"
+                        type="text"
+                        size="80"
+                        tal:attributes="value polgroupsPath"
+                        />
+                </div>
+
                 <div class="formControls">
                     <input
                         type="submit"
diff --git a/tabellio/config/controlpanel.py b/tabellio/config/controlpanel.py
index 4d48729..f268315 100644
--- a/tabellio/config/controlpanel.py
+++ b/tabellio/config/controlpanel.py
@@ -45,10 +45,12 @@ class TabellioControlpanel(BrowserView):
 
             deputies_path = form.get('deputiesPath')
             documents_path = form.get('documentsPath')
+            polgroups_path = form.get('polgroupsPath')
 
             if not self.errors:
                 self.settings.deputiesPath = deputies_path
                 self.settings.documentsPath = documents_path
+                self.settings.polgroupsPath = polgroups_path
 
         if submitted and not self.errors:
             self._setup()
diff --git a/tabellio/config/interfaces.py b/tabellio/config/interfaces.py
index 8004d49..c283577 100644
--- a/tabellio/config/interfaces.py
+++ b/tabellio/config/interfaces.py
@@ -15,3 +15,7 @@ class ITabellioSettings(Interface):
         title=_('documents_path', 'Documents Path'),
         required=False)
 
+    polgroupsPath = schema.TextLine(
+        title=_('polgroups_path', 'Political Groups Path'),
+        required=False)
+
diff --git a/tabellio/config/upgrade.py b/tabellio/config/upgrade.py
new file mode 100644
index 0000000..a26da4c
--- /dev/null
+++ b/tabellio/config/upgrade.py
@@ -0,0 +1,9 @@
+from Products.CMFCore.utils import getToolByName
+
+PROFILE_ID = "profile-tabellio.config:default"
+
+def update_registry(context, logger=None):
+    # Run the registry.xml step as that may have defined new attributes
+    setup = getToolByName(context, 'portal_setup')
+    setup.runImportStepFromProfile(PROFILE_ID, 'plone.app.registry')
+