Made list summary configurable within setup

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@7056 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index e46fa23371d6cc0e563d22be2af9f76c9edd4011..191e2fd9ccc2f4aab7186cccc44d8b1206e63f4f 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -338,7 +338,11 @@
 {/if}
        
        <main default="{$cv.location}"
-
+{if $cv.optional.list_summary}
+               list_summary="true"
+{else}
+               list_summary="false"
+{/if}
 {if $cv.pwd_rules.pwminlen_active}
                pwminlen="{$cv.pwd_rules.pwminlen}"
 {/if}

diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index 4ccc27c488ffada6b4f89543e083a36397a21c77..c344e537e7961cbeda8c7fc44c8fcf49ce63d75f 100644 (file)
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -299,7 +299,11 @@ class MultiSelectWindow{
                $divlist = new divlist($this->string_Title);
                $divlist->SetSummary($this->string_Summary);
                $divlist->SetEntriesPerPage(0); // 0 for scrollable list
-    $divlist->SetFooter($this->get_List_Bottom_Info());
+
+    /* Display list footer with summary of all listed entries */
+    if(isset($this->config->data['MAIN']['LIST_SUMMARY']) && preg_match("/true/i",$this->config->data['MAIN']['LIST_SUMMARY'])){
+      $divlist->SetFooter($this->get_List_Bottom_Info());
+    }
   
     if($this->DivHeight != ""){
       $divlist->SetHeight($this->DivHeight);

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 6bd45ee3402add5d6afb947f511cdf7977ccd2b1..8ed1d6df4b2dcaf0470a84454b94ec81f04bf16c 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -28,6 +28,7 @@ class Step_Config3 extends setup_step
 
   var $optional = array(
               "strict_units" => false,
+              "list_summary" => true,
               "forceglobals" => true,
               "forcessl" => false,
               "ldapstats" => false,
@@ -93,7 +94,7 @@ class Step_Config3 extends setup_step
         }
       }
       
-      foreach(array("strict_units","noprimarygroup","forceglobals","forcessl","ldapstats","warnssl","compile","debuglevel","session_lifetime") as $name){
+      foreach(array("list_summary","strict_units","noprimarygroup","forceglobals","forcessl","ldapstats","warnssl","compile","debuglevel","session_lifetime") as $name){
         if(isset($_POST[$name])){
           $this->optional[$name] = get_post($name);
         }

diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index 6b249ac32e25b728b205ab892c9d62ed9f0b72d3..4f71c89373bf146c06881fc87c2ac9e3e907c242 100644 (file)
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -13,6 +13,18 @@
         </div>
     </div>
 
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Display summary in listings{/t}
+        </div>
+        <div class='step4_value'>
+       
+            <select name="list_summary" size="1" title="">
+               {html_options options=$bool selected=$optional.list_summary}
+            </select>
+        </div>
+    </div>
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Honour administrative units{/t}