summaryrefslogtreecommitdiffstats
path: root/changeset_r322.diff
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2015-10-03 16:34:07 +0200
committerRemi Collet <fedora@famillecollet.com>2015-10-03 16:34:07 +0200
commit00c88393fe363fa4219f44e569f5bf8a9d30058a (patch)
tree82778eee7ee69fb21508c45c9b572ad0f05c0d6d /changeset_r322.diff
parent2eaff9d03fe967e85b8458e705f31031771319f8 (diff)
glpi-reports: upstream patches for 'doublon'
Diffstat (limited to 'changeset_r322.diff')
-rw-r--r--changeset_r322.diff16
1 files changed, 16 insertions, 0 deletions
diff --git a/changeset_r322.diff b/changeset_r322.diff
new file mode 100644
index 0000000..3d7452b
--- /dev/null
+++ b/changeset_r322.diff
@@ -0,0 +1,16 @@
+Index: trunk/report/doublons/doublons.php
+===================================================================
+--- trunk/report/doublons/doublons.php (révision 321)
++++ trunk/report/doublons/doublons.php (révision 322)
+@@ -75,11 +75,6 @@
+ echo "<tr class='tab_bg_1 center'>";
+ echo "<th colspan='3'>".__('Duplicate computers', 'reports')."</th></tr>\n";
+
+-if (Session::haveRight("config", READ)) { // Check only read as we probably use the replicate (no 'w' in this case)
+- echo "<tr class='tab_bg_3 center'><td colspan='".(($crit > 0)?'3':'2')."'>";
+- echo "<a href='./doublons.config.php'>".__('Report configuration', 'reports')."</a></td></tr>\n";
+-}
+-
+ echo "<tr class='tab_bg_1'><td class='right'>"._n('Criterion', 'Criteria', 2). "</td><td>";
+ echo "<select name='crit'>";
+