Merge branch 'master' of https://github.com/unaio/una

unacms · Sep 8, 2021 · e65aa69 · e65aa69
2 parents 3d78836 + e86a866
commit e65aa69
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/modules/base/general/classes/BxBaseModGeneralGridAdministration.php b/modules/base/general/classes/BxBaseModGeneralGridAdministration.php
@@ -30,6 +30,8 @@ public function __construct ($aOptions, $oTemplate = false)
 
         parent::__construct ($aOptions, $oTemplate);
 
+        $this->_aQueryReset = array($this->_aOptions['filter_get'], $this->_aOptions['paginate_get_start'], $this->_aOptions['paginate_get_per_page']);
+
         $this->_sManageType = BX_DOL_MANAGE_TOOLS_ADMINISTRATION;
         $this->_sParamsDivider = '#-#';
 

diff --git a/modules/base/profile/classes/BxBaseModProfileGridAdministration.php b/modules/base/profile/classes/BxBaseModProfileGridAdministration.php
@@ -21,7 +21,7 @@ public function __construct ($aOptions, $oTemplate = false)
 
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        $this->_aQueryReset = array('order_field', 'order_dir', $this->_aOptions['paginate_get_start'], $this->_aOptions['paginate_get_per_page']);
+        $this->_aQueryReset = array($this->_aOptions['paginate_get_start'], $this->_aOptions['paginate_get_per_page']);
 
         $this->_sStatusField = !empty($CNF['FIELD_STATUS']) ? $CNF['FIELD_STATUS'] : 'status';
         $this->_aStatusValues = array('active', 'pending', 'suspended');

diff --git a/template/css/menu.css b/template/css/menu.css
@@ -424,6 +424,9 @@ ul.bx-menu-floating-blocks {
     justify-content: flex-start;
     align-items: center
 }
+.bx-menu-floating-blocks-dash-item span a {
+    display:inline-block !important;
+}
 .bx-menu-floating-blocks-dash-item .bx-menu-floating-blocks-icon {
     position: relative;
     display: -webkit-flex;

diff --git a/template/menu_item_dashboard_manage_tools_addon.html b/template/menu_item_dashboard_manage_tools_addon.html
@@ -6,6 +6,6 @@
         <span class="divider">&bull; </span><span>__value__ __caption__</span>
     </bx_if:counter1>
     <bx_if:counter2>
-        <span class="divider">&bull; </span><span class="col-red1">__value__ __caption__</span>
+        <span class="divider">&bull; </span><span class="col-red1" onclick="location.href = '__link__'; return false">__value__ __caption__</span>
     </bx_if:counter2>
 </div>
diff --git a/template/scripts/BxBaseMenuDashboardManageTools.php b/template/scripts/BxBaseMenuDashboardManageTools.php
@@ -53,14 +53,15 @@ protected function _getTmplVarsAddon($mixedAddon, $aMenuItem)
                 'condition' => $aValues['counter2_value'] > 0,
                 'content' => array(
                     'value' => $aValues['counter2_value'],
-                    'caption' => $aValues['counter2_caption']
+                    'caption' => $aValues['counter2_caption'],
+                    'link' => $aMenuItem['link'] . '?order_field=reports&order_dir=desc'
                 )
             ),
             'bx_if:counter3' => array(
                 'condition' => $aValues['counter3_value'] > 0,
                 'content' => array(
                     'total_value' => $aValues['counter3_value'],
-                    'total_caption' => $aValues['counter3_caption']     
+                    'total_caption' => $aValues['counter3_caption']
                 )
             ),
         );