Merge branch 'release-19.04.0' of https://github.com/centreon/centreon …

…into release-19.04.0
centreon · Apr 24, 2019 · bc03da7 · bc03da7
2 parents 0fdd181 + 3feba0c
commit bc03da7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/www/front_src/src/components/navigation/navigation.scss b/www/front_src/src/components/navigation/navigation.scss
@@ -272,6 +272,7 @@
                   bottom: -50px;
                   right: -50px;
                   left: 0;
+                  z-index: -1;
                 }
               }
             }
@@ -313,6 +314,18 @@
       }
     }
 
+    @media screen and(max-height: 768px) {
+      li.menu-item:last-child > ul.collapsed-items{
+        bottom: 0;
+        top: auto !important;
+      }
+      li.menu-item:nth-child(4) > ul.collapsed-items li.collapsed-item:first-child > ul.collapsed-level-items,
+      li.menu-item:last-child > ul.collapsed-items li.collapsed-item:first-child > ul.collapsed-level-items {
+        bottom: auto;
+        background-color: #fff;
+      }
+    }
+
     .menu {
       &-item {
         &.to-hover:hover {
@@ -846,7 +859,10 @@ a {
 @media screen and(max-width: 1500px) {
   li.menu-item:last-child .collapsed-items li.collapsed-item:first-child > ul.collapsed-level-items {
     max-height: 350px;
-    overflow-x: hidden;
     overflow-y: auto;
+    overflow-x: hidden !important;
   }
+}
+.sidebar.active .menu-item:nth-child(4).active + .menu-item > ul.list-unstyled .collapsed-item:first-child:hover > ul {
+  top: 0;
 }
diff --git a/www/include/Administration/configChangelog/viewLogs.php b/www/include/Administration/configChangelog/viewLogs.php
@@ -178,15 +178,15 @@ function searchUserName($username)
 $logQuery = "SELECT SQL_CALC_FOUND_ROWS object_id, object_type, object_name, "
     . "action_log_date, action_type, log_contact_id, action_log_id "
     . "FROM log_action";
-$query = $logQuery;
+
+$valuesToBind = [];
 if (!empty($searchO) || !empty($searchU) || $otype != 0) {
     $logQuery .= ' WHERE ';
     $hasMultipleSubRequest = false;
 
-    $valuesToBind = [];
     if (!empty($searchO)) {
         $logQuery .= "object_name LIKE :object_name ";
-        $valuesToBind[':object_name'] = "%$searchO%";
+        $valuesToBind[':object_name'] = "%" . $searchO . "%";
         $hasMultipleSubRequest = true;
     }
     if (!empty($searchU)) {
@@ -218,7 +218,7 @@ function searchUserName($username)
 
 $rows = 0;
 
-include("./include/common/checkPagination.php");
+include "./include/common/checkPagination.php";
 
 $elemArray = array();
 if ($prepareSelect->execute()) {