Updated contrib/gosa.conf to include inventory tabs

Updated setup, department migration

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 344b6ff8073f382eac1cb7a2dc327b37af43fd1e..4a79178f6e465fa751294eb5555c609aa8619f9b 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -134,6 +134,7 @@
                <tab class="termservice" name="Devices" />
                <tab class="printgeneric" name="Printer" />
                <tab class="terminfo" name="Information" />
+               <tab class="glpiAccount" name="Inventory" />
                <tab class="reference" name="References" />
        </termtabs>
 
@@ -148,6 +149,7 @@
           <tab class="servrepository" name="Repository" />
           <tab class="faiSummaryTab" name="FAI summary" />
           <tab class="terminfo" name="Information" />
+          <tab class="glpiAccount" name="Inventory" />
           <tab class="reference" name="References" />
        </servtabs>
 
@@ -158,16 +160,19 @@
                <tab class="printgeneric" name="Printer" />
                <tab class="terminfo" name="Information" />
                <tab class="faiSummaryTab" name="FAI summary" />
+               <tab class="glpiAccount" name="Inventory" />
                <tab class="reference" name="References" />
        </worktabs>
 
        <printtabs>
                <tab class="printgeneric" name="Generic" />
+               <tab class="glpiPrinterAccount" name="Inventory" />
                <tab class="reference" name="References" />
        </printtabs>
 
     <phonetabs>
         <tab class="phonegeneric" name="Generic" />
+               <tab class="glpiAccount" name="Inventory" />
                <tab class="reference" name="References" />
     </phonetabs>
 
@@ -190,11 +195,13 @@
 
     <componenttabs>
        <tab class="componentgeneric" name="Generic" />
+               <tab class="glpiAccount" name="Inventory" />
                <tab class="reference" name="References" />
     </componenttabs>
 
     <wintabs>
        <tab class="wingeneric" name="Generic" />
+               <tab class="glpiAccount" name="Inventory" />
                <tab class="reference" name="References" />
     </wintabs>
 

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 911e48552002fb452170d2ede333e376e1c202d6..27687141966d2926731bd7449489a8dea5b351ad 100644 (file)
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -674,7 +674,7 @@ class Step_Migrate extends setup_step
     /* Skip GOsa internal departments */
     $skip_dns = array("/".$cv['peopleou']."/","/".$cv['groupou']."/","/^ou=people,/",
         "/^ou=groups,/","/(,|)ou=configs,/","/(,|)ou=systems,/",
-        "/^ou=apps,/","/^ou=mime,/","/^ou=aclroles,/","/^ou=incoming,/",
+        "/(,|)ou=apps,/","/(,|)ou=mime,/","/^ou=aclroles,/","/^ou=incoming,/",
         "/ou=snapshots,/","/(,|)dc=addressbook,/","/^(,|)ou=machineaccounts,/",
         "/(,|)ou=winstations,/");