Sfoglia il codice sorgente

Ticket #4685 - Timeline: Add 'Status' field to administration grid.

AntonLV 2 anni fa
parent
commit
2a3e579166

+ 6 - 1
modules/boonex/russian/data/langs/bx_timeline/ru.xml

@@ -348,7 +348,8 @@
     <string name="_bx_timeline_grid_filter_item_title_adm_active"><![CDATA[Активные]]></string>
     <string name="_bx_timeline_grid_filter_item_title_adm_hidden"><![CDATA[Спрятанные]]></string>
     <string name="_bx_timeline_grid_filter_item_title_adm_pending"><![CDATA[В ожидании]]></string>
-    <string name="_bx_timeline_grid_column_title_adm_active"><![CDATA[Активные]]></string>
+    <string name="_bx_timeline_grid_column_title_adm_active"><![CDATA[Видимые]]></string>
+    <string name="_bx_timeline_grid_column_title_adm_status"><![CDATA[Статус]]></string>
     <string name="_bx_timeline_grid_column_title_adm_description"><![CDATA[Событие]]></string>
     <string name="_bx_timeline_grid_column_title_adm_added"><![CDATA[Добавлено]]></string>
     <string name="_bx_timeline_grid_column_title_adm_author"><![CDATA[Автор]]></string>
@@ -385,6 +386,10 @@
     <string name="_bx_timeline_txt_or_jump_to"><![CDATA[... или перейти к:]]></string>
     <string name="_bx_timeline_txt_jump_to_n_year"><![CDATA[Перейти к {0} году]]></string>
     <string name="_bx_timeline_txt_jump_to_recent"><![CDATA[Перейти к недавним сообщениям]]></string>
+    <string name="_bx_timeline_txt_status_active"><![CDATA[Активно]]></string>
+    <string name="_bx_timeline_txt_status_awaiting"><![CDATA[В ожидании]]></string>
+    <string name="_bx_timeline_txt_status_failed"><![CDATA[Неисправно]]></string>
+    <string name="_bx_timeline_txt_status_hidden"><![CDATA[Скрыто]]></string>
     <string name="_bx_timeline_txt_status_deleted"><![CDATA[Удалено]]></string>
     <string name="_bx_timeline_txt_hot"><![CDATA['Горячее' событие]]></string>
     <string name="_bx_timeline_txt_pinned"><![CDATA[Приколотое событие]]></string>

+ 5 - 0
modules/boonex/timeline/classes/BxTimelineGridAdministration.php

@@ -24,6 +24,11 @@ class BxTimelineGridAdministration extends BxTimelineGridManageTools
         $this->_aStatusValues = array('active', 'hidden', 'pending');
     }
 
+    protected function _getCellStatus($mixedValue, $sKey, $aField, $aRow)
+    {
+        return parent::_getCellDefault(_t('_bx_timeline_txt_status_' . $mixedValue), $sKey, $aField, $aRow);
+    }
+
     protected function _getCellOwnerId($mixedValue, $sKey, $aField, $aRow)
     {
         $iProfile = $this->_oModule->_oConfig->isSystem($aRow['type'], $aRow['action']) ? $aRow['owner_id'] : $aRow['object_id'];

+ 6 - 1
modules/boonex/timeline/install/langs/en.xml

@@ -363,7 +363,8 @@
     <string name="_bx_timeline_grid_filter_item_title_adm_active"><![CDATA[Active]]></string>
     <string name="_bx_timeline_grid_filter_item_title_adm_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_timeline_grid_filter_item_title_adm_pending"><![CDATA[Pending]]></string>
-    <string name="_bx_timeline_grid_column_title_adm_active"><![CDATA[Active]]></string>
+    <string name="_bx_timeline_grid_column_title_adm_active"><![CDATA[Visible]]></string>
+    <string name="_bx_timeline_grid_column_title_adm_status"><![CDATA[Status]]></string>
     <string name="_bx_timeline_grid_column_title_adm_description"><![CDATA[Event]]></string>
     <string name="_bx_timeline_grid_column_title_adm_added"><![CDATA[Added]]></string>
     <string name="_bx_timeline_grid_column_title_adm_author"><![CDATA[Author]]></string>
@@ -400,6 +401,10 @@
     <string name="_bx_timeline_txt_or_jump_to"><![CDATA[... or jump to:]]></string>
     <string name="_bx_timeline_txt_jump_to_n_year"><![CDATA[Jump to {0} year]]></string>
     <string name="_bx_timeline_txt_jump_to_recent"><![CDATA[Jump to recent posts]]></string>
+    <string name="_bx_timeline_txt_status_active"><![CDATA[Active]]></string>
+    <string name="_bx_timeline_txt_status_awaiting"><![CDATA[Awaiting]]></string>
+    <string name="_bx_timeline_txt_status_failed"><![CDATA[Failed]]></string>
+    <string name="_bx_timeline_txt_status_hidden"><![CDATA[Hidden]]></string>
     <string name="_bx_timeline_txt_status_deleted"><![CDATA[Deleted]]></string>
     <string name="_bx_timeline_txt_hot"><![CDATA[Hot post]]></string>
     <string name="_bx_timeline_txt_pinned"><![CDATA[Pinned post]]></string>

+ 5 - 4
modules/boonex/timeline/install/sql/enable.sql

@@ -565,10 +565,11 @@ INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable
 ('bx_timeline_administration', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_timeline_administration', 'switcher', '_bx_timeline_grid_column_title_adm_active', '8%', 0, '', '', 2),
 ('bx_timeline_administration', 'reports', '_sys_txt_reports_title', '5%', 0, '', '', 3),
-('bx_timeline_administration', 'description', '_bx_timeline_grid_column_title_adm_description', '25%', 0, '25', '', 4),
-('bx_timeline_administration', 'date', '_bx_timeline_grid_column_title_adm_added', '20%', 1, '25', '', 5),
-('bx_timeline_administration', 'owner_id', '_bx_timeline_grid_column_title_adm_author', '20%', 0, '25', '', 6),
-('bx_timeline_administration', 'actions', '', '20%', 0, '', '', 7),
+('bx_timeline_administration', 'status', '_bx_timeline_grid_column_title_adm_status', '5%', 1, 0, '', 4),
+('bx_timeline_administration', 'description', '_bx_timeline_grid_column_title_adm_description', '25%', 0, '25', '', 5),
+('bx_timeline_administration', 'date', '_bx_timeline_grid_column_title_adm_added', '15%', 1, 0, '', 6),
+('bx_timeline_administration', 'owner_id', '_bx_timeline_grid_column_title_adm_author', '20%', 0, 0, '', 7),
+('bx_timeline_administration', 'actions', '', '20%', 0, '', '', 8),
 
 ('bx_timeline_common', 'checkbox', '_sys_select', '2%', 0, 0, '', 1),
 ('bx_timeline_common', 'switcher', '_bx_timeline_grid_column_title_adm_active', '8%', 0, 0, '', 2),