Forum GLPI-Project

MoYo

GLPI - Lead

From: Poitiers

Registered: 2004-09-13

Posts: 14,513

Website

Patchs 0.68.3

1 - OCSNG sync of software do not add history entry for a deletion of a software when the software have only the license which will be deleted :
https://dev.indepnet.net:8080/glpi/changeset/4343

Index: branches/0.68-bugfixes/inc/ocsng.function.php
===================================================================
--- branches/0.68-bugfixes/inc/ocsng.function.php (revision 4188)
+++ branches/0.68-bugfixes/inc/ocsng.function.php (revision 4343)
@@ -1886,5 +1886,6 @@
                 $result=$db->query($query);
                 if ($db->numrows($result)>0)
-                    while ($data=$db->fetch_assoc($result)){
+                    if ($data=$db->fetch_assoc($result)){
+                        uninstallSoftware($key,$dohistory);
                         $query2="SELECT COUNT(*) 
                             FROM glpi_inst_software 
@@ -1906,5 +1907,4 @@
                     }
 
-                uninstallSoftware($key,$dohistory);
                 deleteInOcsArray($glpi_id,$key,"import_software");
             }

---

MoYo - Julien Dombre - Association INDEPNET
Contribute to GLPI :    Support     Contribute     References     Freshmeat

MoYo

GLPI - Lead

From: Poitiers

Registered: 2004-09-13

Posts: 14,513

Website

Re: Patchs 0.68.3

2 - Search on networking information is not able for devices.

https://dev.indepnet.net:8080/glpi/changeset/4386

Index: branches/0.68-bugfixes/inc/search.class.php
===================================================================
--- trunk/inc/search.class.php (revision 3919)
+++ branches/0.68-bugfixes/inc/search.class.php (revision 4386)
@@ -2210,5 +2210,24 @@
 
     ),
-    );
+);
 
+$SEARCH_OPTION[PERIPHERAL_TYPE]['network']=$lang["setup"][88];
+
+$SEARCH_OPTION[PERIPHERAL_TYPE][20]['table']='glpi_networking_ports';
+$SEARCH_OPTION[PERIPHERAL_TYPE][20]['field']='ifaddr';
+$SEARCH_OPTION[PERIPHERAL_TYPE][20]['linkfield']='';
+$SEARCH_OPTION[PERIPHERAL_TYPE][20]['name']=$lang["networking"][14];
+$SEARCH_OPTION[PERIPHERAL_TYPE][20]['meta']=0;
+
+$SEARCH_OPTION[PERIPHERAL_TYPE][21]['table']='glpi_networking_ports';
+$SEARCH_OPTION[PERIPHERAL_TYPE][21]['field']='ifmac';
+$SEARCH_OPTION[PERIPHERAL_TYPE][21]['linkfield']='';
+$SEARCH_OPTION[PERIPHERAL_TYPE][21]['name']=$lang["networking"][15];
+$SEARCH_OPTION[PERIPHERAL_TYPE][21]['meta']=0;
+
+$SEARCH_OPTION[PERIPHERAL_TYPE][22]['table']='glpi_dropdown_netpoint';
+$SEARCH_OPTION[PERIPHERAL_TYPE][22]['field']='name';
+$SEARCH_OPTION[PERIPHERAL_TYPE][22]['linkfield']='';
+$SEARCH_OPTION[PERIPHERAL_TYPE][22]['name']=$lang["networking"][51];
+$SEARCH_OPTION[PERIPHERAL_TYPE][22]['meta']=0;
 ?>

---

MoYo - Julien Dombre - Association INDEPNET
Contribute to GLPI :    Support     Contribute     References     Freshmeat

MoYo

GLPI - Lead

From: Poitiers

Registered: 2004-09-13

Posts: 14,513

Website

Re: Patchs 0.68.3

History problem with OCS :
https://dev.indepnet.net:8080/glpi/changeset/4419

---

MoYo - Julien Dombre - Association INDEPNET
Contribute to GLPI :    Support     Contribute     References     Freshmeat