Package: glpi
Version: 0.83.91-3
Severity: normal
Tags: patch
Hi,
GLPI can't work without extjs. To reproduce this bug, select some
computers, select an action (bottom page drop down list). There's an
AJAX-refreshed div which is supposed to reload and show a new button to
start the selected action. Without extjs installed, no button appears.
Please find attached a patch for the whole package. It also contains a
css typo fix and an import patch for old GLPI versions (coming from
upstream dev "Tsmr" on IRC).
Regards, Adam.
--- System information. ---
Architecture: amd64
Kernel: Linux 3.2.0-4-amd64
Debian Release: jessie/sid
900 testing ftp2.fr.debian.org
500 unstable ftp2.fr.debian.org
500 stable security.debian.org
500 stable ftp2.fr.debian.org
500 stable deb.opera.com
--- Package information. ---
Package's Depends field is empty.
Package's Recommends field is empty.
Package's Suggests field is empty.
diff -Nur /tmp/glpi-0.83.91/debian/changelog glpi-0.83.91/debian/changelog
--- /tmp/glpi-0.83.91/debian/changelog 2013-07-08 11:00:55.000000000 +0200
+++ glpi-0.83.91/debian/changelog 2013-09-11 10:36:25.000000000 +0200
@@ -1,3 +1,12 @@
+glpi (0.83.91-3.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ - Add 00-fix-css-typo patch
+ - Add 01-upgrade-from-0.71-fix patch
+ - Add missing libjs-extjs dependency
+
+ -- Adam Cécile (Le_Vert) <gand...@le-vert.net> Tue, 10 Sep 2013 17:31:51 +0200
+
glpi (0.83.91-3) unstable; urgency=low
* Move default mysql configuration to /usr/share/glpi (Closes: #714812)
diff -Nur /tmp/glpi-0.83.91/debian/control glpi-0.83.91/debian/control
--- /tmp/glpi-0.83.91/debian/control 2013-07-02 10:55:59.000000000 +0200
+++ glpi-0.83.91/debian/control 2013-09-11 10:36:12.000000000 +0200
@@ -16,6 +16,7 @@
ttf-freefont,
tinymce,
libphp-phpmailer,
+ libjs-extjs,
${misc:Depends}
Recommends: mysql-client,
mysql-server
diff -Nur /tmp/glpi-0.83.91/debian/patches/00-fix-css-typo.patch glpi-0.83.91/debian/patches/00-fix-css-typo.patch
--- /tmp/glpi-0.83.91/debian/patches/00-fix-css-typo.patch 1970-01-01 01:00:00.000000000 +0100
+++ glpi-0.83.91/debian/patches/00-fix-css-typo.patch 2013-09-10 17:36:56.000000000 +0200
@@ -0,0 +1,11 @@
+--- glpi/inc/toolbox.class.php.new 2013-09-10 17:28:58.388712110 +0200
++++ glpi/inc/toolbox.class.php 2013-06-25 08:17:42.000000000 +0200
+@@ -491,7 +491,7 @@
+
+ // Display
+ if (!isCommandLine()) {
+- echo '<div style="position:fload-left; background-color:red; z-index:10000">'.
++ echo '<div style="position:float-left; background-color:red; z-index:10000">'.
+ '<span class="b">PHP '.$type.': </span>';
+ echo $errmsg.' in '.$filename.' at line '.$linenum.'</div>';
+ } else {
diff -Nur /tmp/glpi-0.83.91/debian/patches/01-upgrade-from-0.71-fix.patch glpi-0.83.91/debian/patches/01-upgrade-from-0.71-fix.patch
--- /tmp/glpi-0.83.91/debian/patches/01-upgrade-from-0.71-fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ glpi-0.83.91/debian/patches/01-upgrade-from-0.71-fix.patch 2013-09-10 17:31:10.000000000 +0200
@@ -0,0 +1,11 @@
+--- glpi/install/update_0713_072.php 2013-06-25 08:17:42.000000000 +0200
++++ glpi/install/update_0713_072.php.new 2013-09-10 17:30:35.825234998 +0200
+@@ -325,7 +325,7 @@
+ $query_search_version = "SELECT *
+ FROM `glpi_softwareversions`
+ WHERE `sID` = '".$soft['ID']."'
+- AND `name` = '".$vers['version']."'";
++ AND `name` = '".addslashes($vers['version'])."'";
+
+ if ($result_searchvers = $DB->query($query_search_version)) {
+ // Version already exists : update inst_software
diff -Nur /tmp/glpi-0.83.91/debian/patches/series glpi-0.83.91/debian/patches/series
--- /tmp/glpi-0.83.91/debian/patches/series 2013-06-26 17:08:17.000000000 +0200
+++ glpi-0.83.91/debian/patches/series 2013-09-10 17:36:23.000000000 +0200
@@ -1 +1,3 @@
02-remove-code-copy-phpmailer.patch
+00-fix-css-typo.patch
+01-upgrade-from-0.71-fix.patch
