Bug 23975: (RM follow-up) Comment example configuration

As promised, I am commenting out the configuration for git repositories
to use for searches by default prior to release. To enable the feature,
simply uncomment the relevant github repositories or add your own.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 44f5576..fe71b9a 100644 (file)
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -410,6 +410,7 @@ __END_SRU_PUBLICSERVER__
  <dev_install>0</dev_install>
  <strict_sql_modes>0</strict_sql_modes>
  <plugin_repos>
+    <!--
     <repo>
         <name>ByWater Solutions</name>
         <org_name>bywatersolutions</org_name>
@@ -425,6 +426,7 @@ __END_SRU_PUBLICSERVER__
         <org_name>ptfs-europe</org_name>
         <service>github</service>
     </repo>
+    -->
  </plugin_repos>
 
  <koha_xslt_security>

diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index ead08aa..9e6cb59 100644 (file)
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -234,6 +234,7 @@ __PAZPAR2_TOGGLE_XML_POST__
  <dev_install>0</dev_install>
  <strict_sql_modes>0</strict_sql_modes>
  <plugin_repos>
+    <!--
     <repo>
         <name>ByWater Solutions</name>
         <org_name>bywatersolutions</org_name>
@@ -249,6 +250,7 @@ __PAZPAR2_TOGGLE_XML_POST__
         <org_name>ptfs-europe</org_name>
         <service>github</service>
     </repo>
+    -->
  </plugin_repos>
 
  <koha_xslt_security>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
index 1b24428..1dff528 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/plugins/plugins-home.tt
@@ -41,6 +41,7 @@
                                 </ul>
                             </div>
 
+                            [% IF can_search %]
                             <div class="btn-group">
                                 <form class="form-inline" id="plugin-search-form">
                                     <div class="form-group">
@@ -53,6 +54,7 @@
                                     </div>
                                 </form>
                             </div>
+                            [% END %]
                         </div>
                     [% END %]
                     <h1>Plugins</h1>

diff --git a/plugins/plugins-home.pl b/plugins/plugins-home.pl
index f376e17..e3335ab 100755 (executable)
--- a/plugins/plugins-home.pl
+++ b/plugins/plugins-home.pl
@@ -60,6 +60,7 @@ if ($plugins_enabled) {
 
     $template->param( plugins => \@plugins, );
 
+    $template->param( can_search => C4::Context->config('plugin_repos') ? 1 : 0 );
     my @results;
     if ($plugin_search) {
         my $repos = C4::Context->config('plugin_repos');