RomanL 8 лет назад
Родитель
Сommit
950efaaede

+ 2 - 2
modules/base/text/classes/BxBaseModTextGridAdministration.php

@@ -85,7 +85,7 @@ class BxBaseModTextGridAdministration extends BxBaseModGeneralGridAdministration
     protected function _getCellHeaderReports ($sKey, $aField)
     {
         $s = parent::_getCellHeaderDefault($sKey, $aField);
-        return preg_replace ('/<a(.*?)>(.*?)<\/a>/', '<a$1><i class="sys-icon exclamation-triangle"></i></a>', $s);
+        return preg_replace ('/<a(.*?)>(.*?)<\/a>/', '<a$1 title="' . _t('_sys_txt_reports_title') . '"><i class="sys-icon exclamation-triangle"></i></a>', $s);
     }
     
     protected function _getCellReports($mixedValue, $sKey, $aField, $aRow)
@@ -95,7 +95,7 @@ class BxBaseModTextGridAdministration extends BxBaseModGeneralGridAdministration
         }
         else{
             $CNF = &$this->_oModule->_oConfig->CNF;
-            $oReports = isset($CNF['OBJECT_REPORTS']) ? BxBaseReport::getObjectInstance($CNF['OBJECT_REPORTS'], $aRow[$CNF['FIELD_ID']]) : null;
+            $oReports = isset($CNF['OBJECT_REPORTS']) ? BxDolReport::getObjectInstance($CNF['OBJECT_REPORTS'], $aRow[$CNF['FIELD_ID']]) : null;
             if ($oReports){
                 $mixedValue = $oReports->getCounter().$oReports->getJsScript();
             }

+ 1 - 0
modules/boonex/english/data/langs/system/en.xml

@@ -2623,6 +2623,7 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_txt_unsubscribe_info"><![CDATA[Update email preferences for <b>{0}</b>]]></string>
     <string name="_sys_txt_unsubscribe_wrong_link"><![CDATA[Unsubscribe link is wrong.]]></string>
     <string name="_sys_txt_user_n"><![CDATA[User #{0}]]></string>
+  <string name="_sys_txt_reports_title"><![CDATA[Reports]]></string>
 	<string name="_sys_upgrade_conclusion"><![CDATA[<h3>Important info:</h3><p>{0}</p>]]></string>
 	<string name="_sys_upgrade_db_and_files_versions_different"><![CDATA[Database and files versions are different, probably previous patch wasn't applied correctly.]]></string>
 	<string name="_sys_upgrade_files_checksum_failed"><![CDATA[Can't apply upgrade because the following files were modified: {0}]]></string>

+ 2 - 2
modules/boonex/posts/install/sql/enable.sql

@@ -391,10 +391,10 @@ INSERT INTO `sys_objects_grid` (`object`, `source_type`, `source`, `table`, `fie
 INSERT INTO `sys_grid_fields` (`object`, `name`, `title`, `width`, `translatable`, `chars_limit`, `params`, `order`) VALUES
 ('bx_posts_administration', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_posts_administration', 'switcher', '_bx_posts_grid_column_title_adm_active', '8%', 0, '', '', 2),
-('bx_posts_administration', 'reports', '_bx_posts_grid_column_title_adm_reports', '4%', 0, '', '', 3),
+('bx_posts_administration', 'reports', '_bx_posts_grid_column_title_adm_reports', '5%', 0, '', '', 3),
 ('bx_posts_administration', 'title', '_bx_posts_grid_column_title_adm_title', '25%', 0, '25', '', 4),
 ('bx_posts_administration', 'added', '_bx_posts_grid_column_title_adm_added', '20%', 1, '25', '', 5),
-('bx_posts_administration', 'author', '_bx_posts_grid_column_title_adm_author', '21%', 0, '25', '', 6),
+('bx_posts_administration', 'author', '_bx_posts_grid_column_title_adm_author', '20%', 0, '25', '', 6),
 ('bx_posts_administration', 'actions', '', '20%', 0, '', '', 7),
 ('bx_posts_common', 'checkbox', '_sys_select', '2%', 0, '', '', 1),
 ('bx_posts_common', 'switcher', '_bx_posts_grid_column_title_adm_active', '8%', 0, '', '', 2),

+ 1 - 0
modules/boonex/russian/data/langs/system/ru.xml

@@ -2620,6 +2620,7 @@
 	<string name="_sys_txt_unsubscribe_info"><![CDATA[Обновить имейл-установки для <b>{0}</b>]]></string>
     <string name="_sys_txt_unsubscribe_wrong_link"><![CDATA[Ссылка отписки неправильная.]]></string>
     <string name="_sys_txt_user_n"><![CDATA[Пользователь #{0}]]></string>
+  <string name="_sys_txt_reports_title"><![CDATA[Отчеты]]></string>
 	<string name="_sys_upgrade_conclusion"><![CDATA[<h3>Важная информация:</h3><p>{0}</p>]]></string>
 	<string name="_sys_upgrade_db_and_files_versions_different"><![CDATA[База данных и версии файлов отличаются, возможно, предыдущий патч не был правильно применён.]]></string>
 	<string name="_sys_upgrade_files_checksum_failed"><![CDATA[Невозможно применить обновление, так как следующие файлы были изменены: {0}]]></string>