From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 19 Jun 2007 06:30:13 +0000 (+0000)
Subject: Updated contrib/gosa.conf to include inventory tabs
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c97226ff7681880591f7d2ce174f27c7f393b087;p=gosa.git

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 344b6ff80..4a79178f6 100644
--- 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 911e48552..276871419 100644
--- 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,/");