Édition de l'url du serveur Solr.

diff --git a/catalog.py b/catalog.py
index 69bb701e1dc450e41fb185a758fd78e5a667a1ff..7e4908385b47337f4a16d49bbd6c17c9b8652774 100644 (file)
--- a/catalog.py
+++ b/catalog.py
@@ -58,9 +58,10 @@ class CatalogTool(BaseCatalogTool) :
         """ read the method name """
         return self.delegatedIndexes
     
         """ read the method name """
         return self.delegatedIndexes
     

-    security.declareProtected(ManagePortal, 'setDelegatedIndexes')
-    def setDelegatedIndexes(self, indexes, REQUEST=None) :
-        """setDelegatedIndexes documentation"""
+    security.declareProtected(ManagePortal, 'setSolrProperties')
+    def setSolrProperties(self, url, indexes, REQUEST=None) :
+        """ set Solr server url and delegated indexes """
+        self.solr_url = url

         self.delegatedIndexes = tuple([i.strip() for i in indexes if i.strip()])
         if REQUEST :
             REQUEST.RESPONSE.redirect(self.absolute_url() + '/manage_solr?manage_tabs_message=Saved changes.')
         self.delegatedIndexes = tuple([i.strip() for i in indexes if i.strip()])
         if REQUEST :
             REQUEST.RESPONSE.redirect(self.absolute_url() + '/manage_solr?manage_tabs_message=Saved changes.')

diff --git a/locales/en/LC_MESSAGES/plinn.mo b/locales/en/LC_MESSAGES/plinn.mo
index 867dfffd49a3b12203fdfd6ea7db05ac848f9e2c..fa2a7df82e3d8a1e2dd80f018bc9cc2e40c3ca3c 100644 (file)
Binary files a/locales/en/LC_MESSAGES/plinn.mo and b/locales/en/LC_MESSAGES/plinn.mo differ

diff --git a/locales/en/LC_MESSAGES/plinn.po b/locales/en/LC_MESSAGES/plinn.po
index 6bf883fe8c581cd4c919b5f9cd071cc58e5f4d3b..18ef7b0cc7fcd3178270658f99043121f091f2a5 100644 (file)
--- a/locales/en/LC_MESSAGES/plinn.po
+++ b/locales/en/LC_MESSAGES/plinn.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"

-"POT-Creation-Date: Tue Oct 14 15:55:50 2014\n"
-"PO-Revision-Date: 2014-10-14 15:56+0200\n"
+"POT-Creation-Date: Mon Dec 15 15:35:05 2014\n"
+"PO-Revision-Date: 2014-12-15 15:41+0100\n"

 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "Language: \n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "Language: \n"


@@ -236,7 +236,7 @@ msgstr "Add"
 #: n/skins/content/topic_edit_template.pt:26
 #: n/skins/custom_content/document_edit_template.pt:23
 #: n/skins/custom_content/event_edit_template.pt:135
 #: n/skins/content/topic_edit_template.pt:26
 #: n/skins/custom_content/document_edit_template.pt:23
 #: n/skins/custom_content/event_edit_template.pt:135

-#: n/skins/generic/search_results_template.pt:87 n/www/manage_solr.pt:13
+#: n/skins/generic/search_results_template.pt:87 n/www/manage_solr.pt:20

 msgid "Save"
 msgstr "Save"
 
 msgid "Save"
 msgstr "Save"
 


@@ -2071,11 +2071,15 @@ msgstr "(No title)"
 msgid "(No description)"
 msgstr "(No description)"
 
 msgid "(No description)"
 msgstr "(No description)"
 

-#: n/www/manage_solr.pt:4
-msgid "Configure Solr delegated indexes"
-msgstr "Configure Solr delegated indexes"
+#: n/www/manage_solr.pt:6
+msgid "Solr server url"
+msgstr "Solr server url"

 
 

-#: n/www/manage_solr.pt:5
+#: n/www/manage_solr.pt:11
+msgid "Solr delegated indexes"
+msgstr "Solr delegated indexes"
+
+#: n/www/manage_solr.pt:12

 msgid "Enter names of indexes to delegate to Solr. One per line."
 msgstr "Enter names of indexes to delegate to Solr. One per line."
 
 msgid "Enter names of indexes to delegate to Solr. One per line."
 msgstr "Enter names of indexes to delegate to Solr. One per line."
 


@@ -2933,5 +2937,8 @@ msgstr "Directory"
 msgid "Configure portal"
 msgstr "Configure portal"
 
 msgid "Configure portal"
 msgstr "Configure portal"
 

+#~ msgid "Configure Solr delegated indexes"
+#~ msgstr "Configure Solr delegated indexes"
+

 #~ msgid "Modified on ${date} at ${time} – creator: ${creator}"
 #~ msgstr "Modified on ${date} at ${time} – creator: ${creator}"
 #~ msgid "Modified on ${date} at ${time} – creator: ${creator}"
 #~ msgstr "Modified on ${date} at ${time} – creator: ${creator}"

diff --git a/locales/fr/LC_MESSAGES/plinn.mo b/locales/fr/LC_MESSAGES/plinn.mo
index 9ec97d3daa9b80516d5bfef47f3a1f46b234e934..c99b2ea96e41425bc5e163f782387c6bfc700577 100644 (file)
Binary files a/locales/fr/LC_MESSAGES/plinn.mo and b/locales/fr/LC_MESSAGES/plinn.mo differ

diff --git a/locales/fr/LC_MESSAGES/plinn.po b/locales/fr/LC_MESSAGES/plinn.po
index f7e367747f28a484afb8b326c07ef30fee523be9..a6f708973e14a84b6952fcd9610d3a38f42e91fd 100644 (file)
--- a/locales/fr/LC_MESSAGES/plinn.po
+++ b/locales/fr/LC_MESSAGES/plinn.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"

-"POT-Creation-Date: Tue Oct 14 15:55:50 2014\n"
-"PO-Revision-Date: 2014-10-14 15:57+0200\n"
+"POT-Creation-Date: Mon Dec 15 15:35:05 2014\n"
+"PO-Revision-Date: 2014-12-15 15:42+0100\n"

 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"


@@ -229,7 +229,7 @@ msgstr "Ajouter"
 #: n/skins/content/topic_edit_template.pt:26
 #: n/skins/custom_content/document_edit_template.pt:23
 #: n/skins/custom_content/event_edit_template.pt:135
 #: n/skins/content/topic_edit_template.pt:26
 #: n/skins/custom_content/document_edit_template.pt:23
 #: n/skins/custom_content/event_edit_template.pt:135

-#: n/skins/generic/search_results_template.pt:87 n/www/manage_solr.pt:13
+#: n/skins/generic/search_results_template.pt:87 n/www/manage_solr.pt:20

 msgid "Save"
 msgstr "Enregistrer"
 
 msgid "Save"
 msgstr "Enregistrer"
 


@@ -2100,11 +2100,15 @@ msgstr "(Sans titre)"
 msgid "(No description)"
 msgstr "(Sans description)"
 
 msgid "(No description)"
 msgstr "(Sans description)"
 

-#: n/www/manage_solr.pt:4
-msgid "Configure Solr delegated indexes"
-msgstr "Configurer les index délégués à Solr"
+#: n/www/manage_solr.pt:6
+msgid "Solr server url"
+msgstr "Url du serveur Solr"

 
 

-#: n/www/manage_solr.pt:5
+#: n/www/manage_solr.pt:11
+msgid "Solr delegated indexes"
+msgstr "Index délégués à Solr"
+
+#: n/www/manage_solr.pt:12

 msgid "Enter names of indexes to delegate to Solr. One per line."
 msgstr "Entrer les noms des index à déléguer à Solr. Un par ligne."
 
 msgid "Enter names of indexes to delegate to Solr. One per line."
 msgstr "Entrer les noms des index à déléguer à Solr. Un par ligne."
 


@@ -2967,6 +2971,9 @@ msgstr "Annuaire"
 msgid "Configure portal"
 msgstr "Configurer portail"
 
 msgid "Configure portal"
 msgstr "Configurer portail"
 

+#~ msgid "Configure Solr delegated indexes"
+#~ msgstr "Configurer les index délégués à Solr"
+

 #~ msgid "Modified on ${date} at ${time} – creator: ${creator}"
 #~ msgstr "Modifié le ${date} à ${time} – créateur : ${creator}"
 
 #~ msgid "Modified on ${date} at ${time} – creator: ${creator}"
 #~ msgstr "Modifié le ${date} à ${time} – créateur : ${creator}"
 

diff --git a/locales/plinn.pot b/locales/plinn.pot
index 63347439bf7f19ca63b365b040d16e231782531d..f288f5aa1feaa4292028e6864fefa18a56860772 100644 (file)
--- a/locales/plinn.pot
+++ b/locales/plinn.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"

-"POT-Creation-Date: Tue Oct 14 15:55:50 2014\n"
+"POT-Creation-Date: Mon Dec 15 15:39:47 2014\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"


@@ -238,7 +238,7 @@ msgstr ""
 #: n/skins/custom_content/document_edit_template.pt:23
 #: n/skins/custom_content/event_edit_template.pt:135
 #: n/skins/generic/search_results_template.pt:87
 #: n/skins/custom_content/document_edit_template.pt:23
 #: n/skins/custom_content/event_edit_template.pt:135
 #: n/skins/generic/search_results_template.pt:87

-#: n/www/manage_solr.pt:13
+#: n/www/manage_solr.pt:20

 msgid "Save"
 msgstr ""
 
 msgid "Save"
 msgstr ""
 


@@ -1921,11 +1921,15 @@ msgstr ""
 msgid "(No description)"
 msgstr ""
 
 msgid "(No description)"
 msgstr ""
 

-#: n/www/manage_solr.pt:4
-msgid "Configure Solr delegated indexes"
+#: n/www/manage_solr.pt:6
+msgid "Solr server url"

 msgstr ""
 
 msgstr ""
 

-#: n/www/manage_solr.pt:5
+#: n/www/manage_solr.pt:11
+msgid "Solr delegated indexes"
+msgstr ""
+
+#: n/www/manage_solr.pt:12

 msgid "Enter names of indexes to delegate to Solr. One per line."
 msgstr ""
 
 msgid "Enter names of indexes to delegate to Solr. One per line."
 msgstr ""
 

diff --git a/www/manage_solr.pt b/www/manage_solr.pt
index 390369849d3d83bbaad9e4525c2df9772fc970bb..48e669eef9f9d95e9728d1a95947a8ad6fbc108f 100644 (file)
--- a/www/manage_solr.pt
+++ b/www/manage_solr.pt
@@ -1,18 +1,23 @@
 <tal:header tal:replace="structure here/manage_page_header">header</tal:header>
 <tal:tabs   tal:replace="structure here/manage_tabs">tabs</tal:tabs>
 <div i18n:domain="plinn">
 <tal:header tal:replace="structure here/manage_page_header">header</tal:header>
 <tal:tabs   tal:replace="structure here/manage_tabs">tabs</tal:tabs>
 <div i18n:domain="plinn">

-  <h3 i18n:translate="">Configure Solr delegated indexes</h3>
-  <p class="form-help" i18n:translate="">
-    Enter names of indexes to delegate to Solr.
-    One per line.
-  </p>

   <form action="." method="post" tal:attributes="action here/absolute_url">
   <form action="." method="post" tal:attributes="action here/absolute_url">

-    <textarea name="indexes:lines" cols="40" rows="24"
-              tal:content="python:'\n'.join(here.getDelegatedIndexes())">
-    </textarea><br/>
-    <input type="submit" name="setDelegatedIndexes:method" value="Save" i18n:attributes="value" />
+    <div>
+      <h3 i18n:translate="">Solr server url</h3>
+      <input type="text" name="url" size="60"
+             tal:attributes="value here/solr_url"/>
+    </div>
+    <div>
+      <h3 i18n:translate="">Solr delegated indexes</h3>
+      <p class="form-help" i18n:translate="">
+        Enter names of indexes to delegate to Solr.
+        One per line.
+      </p>
+      <textarea name="indexes:lines" cols="40" rows="24"
+                tal:content="python:'\n'.join(here.getDelegatedIndexes())">
+      </textarea><br/>
+    </div>
+    <input type="submit" name="setSolrProperties:method" value="Save" i18n:attributes="value" />

   </form>
 </div>
 <tal:footer tal:replace="structure here/manage_page_footer">footer</tal:footer>
   </form>
 </div>
 <tal:footer tal:replace="structure here/manage_page_footer">footer</tal:footer>

-
-