Răsfoiți Sursa

#2682 Add "updated" date along with "installed" date

RomanL 5 ani în urmă
părinte
comite
10f77f39eb

+ 5 - 4
install/sql/system.sql

@@ -294,10 +294,11 @@ SET @iCategoryId = LAST_INSERT_ID();
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_params`, `check_error`, `order`) VALUES
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_params`, `check_error`, `order`) VALUES
 (@iCategoryId, 'sys_cron_time', '_adm_stg_cpt_option_sys_cron_time', '0', 'digit', '', '', '', '', 2),
 (@iCategoryId, 'sys_cron_time', '_adm_stg_cpt_option_sys_cron_time', '0', 'digit', '', '', '', '', 2),
 (@iCategoryId, 'sys_install_time', '_adm_stg_cpt_option_sys_install_time', '0', 'digit', '', '', '', '', 3),
 (@iCategoryId, 'sys_install_time', '_adm_stg_cpt_option_sys_install_time', '0', 'digit', '', '', '', '', 3),
-(@iCategoryId, 'sys_upgrade_channel', '_adm_stg_cpt_option_sys_upgrade_channel', 'stable', 'select', 'stable,beta', '', '', '', 4),
-(@iCategoryId, 'sys_revision', '_adm_stg_cpt_option_sys_revision', '0', 'digit', '', '', '', '', 5),
-(@iCategoryId, 'sys_eq_time', '_adm_stg_cpt_option_sys_eq_time', '0', 'digit', '', '', '', '', 6),
-(@iCategoryId, 'sys_push_queue_time', '_adm_stg_cpt_option_sys_push_queue_time', '0', 'digit', '', '', '', '', 7),
+(@iCategoryId, 'sys_update_time', '_adm_stg_cpt_option_sys_update_time', '0', 'digit', '', '', '', '', 4),
+(@iCategoryId, 'sys_upgrade_channel', '_adm_stg_cpt_option_sys_upgrade_channel', 'stable', 'select', 'stable,beta', '', '', '', 5),
+(@iCategoryId, 'sys_revision', '_adm_stg_cpt_option_sys_revision', '0', 'digit', '', '', '', '', 6),
+(@iCategoryId, 'sys_eq_time', '_adm_stg_cpt_option_sys_eq_time', '0', 'digit', '', '', '', '', 7),
+(@iCategoryId, 'sys_push_queue_time', '_adm_stg_cpt_option_sys_push_queue_time', '0', 'digit', '', '', '', '', 8),
 
 
 (@iCategoryId, 'sys_ftp_login', '_adm_stg_cpt_option_sys_ftp_login', '', 'digit', '', '', '', '', 10),
 (@iCategoryId, 'sys_ftp_login', '_adm_stg_cpt_option_sys_ftp_login', '', 'digit', '', '', '', '', 10),
 (@iCategoryId, 'sys_ftp_password', '_adm_stg_cpt_option_sys_ftp_password', '', 'digit', '', '', '', '', 11),
 (@iCategoryId, 'sys_ftp_password', '_adm_stg_cpt_option_sys_ftp_password', '', 'digit', '', '', '', '', 11),

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

@@ -618,6 +618,7 @@
 	<string name="_adm_dbd_txt_script_on"><![CDATA[UNA on]]></string>
 	<string name="_adm_dbd_txt_script_on"><![CDATA[UNA on]]></string>
 	<string name="_adm_dbd_txt_htools_status"><![CDATA[{0} - <b>{1}</b>]]></string>
 	<string name="_adm_dbd_txt_htools_status"><![CDATA[{0} - <b>{1}</b>]]></string>
 	<string name="_adm_dbd_txt_installed"><![CDATA[Installed:]]></string>
 	<string name="_adm_dbd_txt_installed"><![CDATA[Installed:]]></string>
+	<string name="_adm_dbd_txt_updated"><![CDATA[Updated:]]></string>
 	<string name="_adm_dbd_txt_version"><![CDATA[Version:]]></string>
 	<string name="_adm_dbd_txt_version"><![CDATA[Version:]]></string>
     <string name="_adm_dbd_msg_upgrade_started"><![CDATA[Site will be upgraded within a minute.<br />Don't forget to <a href="{0}store.php?page=updates">check for modules updates</a> after that.]]></string>
     <string name="_adm_dbd_msg_upgrade_started"><![CDATA[Site will be upgraded within a minute.<br />Don't forget to <a href="{0}store.php?page=updates">check for modules updates</a> after that.]]></string>
 	<string name="_adm_dbd_txt_su_database"><![CDATA[Database]]></string>
 	<string name="_adm_dbd_txt_su_database"><![CDATA[Database]]></string>
@@ -1531,6 +1532,7 @@
 	<string name="_adm_stg_cpt_option_sys_ftp_password"><![CDATA[FTP server password]]></string>
 	<string name="_adm_stg_cpt_option_sys_ftp_password"><![CDATA[FTP server password]]></string>
 	<string name="_adm_stg_cpt_option_sys_cron_time"><![CDATA[Last cron execution time]]></string>
 	<string name="_adm_stg_cpt_option_sys_cron_time"><![CDATA[Last cron execution time]]></string>
 	<string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Installation date]]></string>
 	<string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Installation date]]></string>
+	<string name="_adm_stg_cpt_option_sys_update_time"><![CDATA[Last update]]></string>
 	<string name="_adm_stg_cpt_option_sys_upgrade_channel"><![CDATA[Update channel]]></string>
 	<string name="_adm_stg_cpt_option_sys_upgrade_channel"><![CDATA[Update channel]]></string>
 	<string name="_adm_stg_cpt_option_sys_live_updates_interval"><![CDATA[Live updates interval (in milliseconds)]]></string>
 	<string name="_adm_stg_cpt_option_sys_live_updates_interval"><![CDATA[Live updates interval (in milliseconds)]]></string>
     <string name="_adm_stg_cpt_option_sys_location_field_default"><![CDATA[Location field provider]]></string>
     <string name="_adm_stg_cpt_option_sys_location_field_default"><![CDATA[Location field provider]]></string>

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

@@ -1517,6 +1517,7 @@
 	<string name="_adm_stg_cpt_option_sys_ftp_password"><![CDATA[FTP-сервер - Пароль]]></string>
 	<string name="_adm_stg_cpt_option_sys_ftp_password"><![CDATA[FTP-сервер - Пароль]]></string>
 	<string name="_adm_stg_cpt_option_sys_cron_time"><![CDATA[Дата последнего запуска планировщика]]></string>
 	<string name="_adm_stg_cpt_option_sys_cron_time"><![CDATA[Дата последнего запуска планировщика]]></string>
     <string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Дата установки]]></string>
     <string name="_adm_stg_cpt_option_sys_install_time"><![CDATA[Дата установки]]></string>
+	<string name="_adm_stg_cpt_option_sys_update_time"><![CDATA[Последнее обновление]]></string>
     <string name="_adm_stg_cpt_option_sys_upgrade_channel"><![CDATA[Канал обновлений]]></string>
     <string name="_adm_stg_cpt_option_sys_upgrade_channel"><![CDATA[Канал обновлений]]></string>
     <string name="_adm_stg_cpt_option_sys_live_updates_interval"><![CDATA[Интервал обновлений (в миллисекундах)]]></string>
     <string name="_adm_stg_cpt_option_sys_live_updates_interval"><![CDATA[Интервал обновлений (в миллисекундах)]]></string>
     <string name="_adm_stg_cpt_option_sys_location_field_default"><![CDATA[Поставщик для поля ввода адреса]]></string>
     <string name="_adm_stg_cpt_option_sys_location_field_default"><![CDATA[Поставщик для поля ввода адреса]]></string>

+ 5 - 2
studio/classes/BxDolStudioDashboard.php

@@ -67,10 +67,13 @@ class BxDolStudioDashboard extends BxTemplStudioWidget
 
 
             	case 'perform_upgrade':
             	case 'perform_upgrade':
                     $oUpgrader = bx_instance('BxDolUpgrader');
                     $oUpgrader = bx_instance('BxDolUpgrader');
-                    if(!$oUpgrader->prepare(false))
+                    if(!$oUpgrader->prepare(false)){
                         $aResult = array('code' => 1, 'message' => $oUpgrader->getError());
                         $aResult = array('code' => 1, 'message' => $oUpgrader->getError());
-                    else
+					}
+                    else{
+						$this->oDb->setUpdateDate();
                         $aResult = array('code' => 0, 'message' => _t('_adm_dbd_msg_upgrade_started', BX_DOL_URL_STUDIO));
                         $aResult = array('code' => 0, 'message' => _t('_adm_dbd_msg_upgrade_started', BX_DOL_URL_STUDIO));
+					}
                     break;
                     break;
 
 
                 case 'clear_cache':
                 case 'clear_cache':

+ 6 - 0
studio/classes/BxDolStudioDashboardQuery.php

@@ -19,6 +19,12 @@ class BxDolStudioDashboardQuery extends BxDolStudioPageQuery
     	$sSql = "SELECT SUM(`current_size`) AS `size` FROM `sys_objects_storage` WHERE `object` LIKE " . $this->escape($sModule . '%') . " LIMIT 1";
     	$sSql = "SELECT SUM(`current_size`) AS `size` FROM `sys_objects_storage` WHERE `object` LIKE " . $this->escape($sModule . '%') . " LIMIT 1";
     	return $this->getOne($sSql);
     	return $this->getOne($sSql);
     }
     }
+    
+    function setUpdateDate()
+    {
+    	$sSql = "UPDATE `sys_options` SET value = :value WHERE `name` = 'sys_update_time'";
+    	return $this->query($sSql, ['value' => time()]);
+    }
 }
 }
 
 
 /** @} */
 /** @} */

+ 6 - 1
studio/template/dbd_versions.html

@@ -4,7 +4,12 @@
     </div>
     </div>
     <div class="bx-dbd-virsion-info">
     <div class="bx-dbd-virsion-info">
         <div class="bx-def-margin-thd-top"><bx_text:_adm_dbd_txt_script_on />&nbsp;<b>__domain__</b></div>
         <div class="bx-def-margin-thd-top"><bx_text:_adm_dbd_txt_script_on />&nbsp;<b>__domain__</b></div>
-        <div class="bx-def-margin-thd-top"><bx_text:_adm_dbd_txt_version />&nbsp;<b>__version__</b>&nbsp;<bx_text:_adm_dbd_txt_installed />&nbsp;<b>__installed__</b></div>
+        <div class="bx-def-margin-thd-top">
+			<bx_text:_adm_dbd_txt_version />&nbsp;<b>__version__</b>&nbsp;<bx_text:_adm_dbd_txt_installed />&nbsp;<b>__installed__</b>
+			<bx_if:show_update_info>
+				&nbsp;<bx_text:_adm_dbd_txt_updated />&nbsp;<b>__updated__</b>
+			</bx_if:show_update_info>
+		</div>
         <div class="bx-dbd-version-available bx-def-margin-thd-top bx-clearfix"></div>
         <div class="bx-dbd-version-available bx-def-margin-thd-top bx-clearfix"></div>
     </div>
     </div>
     <script language="javascript">
     <script language="javascript">

+ 7 - 1
studio/template/scripts/BxBaseStudioDashboard.php

@@ -119,7 +119,13 @@ class BxBaseStudioDashboard extends BxDolStudioDashboard
         	'js_object' => $sJsObject,
         	'js_object' => $sJsObject,
             'domain' => getParam('site_title'),
             'domain' => getParam('site_title'),
             'version' => bx_get_ver(),
             'version' => bx_get_ver(),
-            'installed' => bx_time_js(getParam('sys_install_time'))
+            'installed' => bx_time_js(getParam('sys_install_time')),
+			'bx_if:show_update_info' => array(
+        		'condition' => getParam('sys_update_time') > 0,
+        		'content' => array(
+		        	'updated' => bx_time_js(getParam('sys_update_time')),
+       			)
+       		),
         ));
         ));
 
 
     	return array('content' => $sContent);
     	return array('content' => $sContent);