Page MenuHomeIn-Portal Phabricator
Files F1046468

D50.id125.diff
No OneTemporary
Actions

File Metadata

Created
Sat, Jun 28, 7:22 PM

D50.id125.diff
View Options

Index: core/admin_templates/tools/system_tools.tpl
===================================================================
--- core/admin_templates/tools/system_tools.tpl
+++ core/admin_templates/tools/system_tools.tpl
@@ -38,8 +38,8 @@
<strong><inp2:m_Phrase name="la_hint_SystemToolsCacheKeys"/></strong>: <strong><i><inp2:m_if check="adm_MemoryCacheEnabled">master:</inp2:m_if>configs_parsed</i></strong> (<inp2:m_if check="adm_MemoryCacheEnabled"><inp2:m_Phrase name="la_hint_SystemToolsMemoryCache"/><inp2:m_else/><inp2:m_Phrase name="la_hint_SystemToolsDatabaseCache"/></inp2:m_if>)
</div>
</div>
- <input type="button" class="button" onclick="submit_event('adm', 'OnResetParsedData');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/> <inp2:m_Phrase name="la_text_Or"/>
- <input type="button" class="button" onclick="Application.SetVar('validate_configs', 1); submit_event('adm', 'OnResetParsedData'); Application.SetVar('validate_configs', null);" value="<inp2:m_Phrase name="la_btn_ResetAndValidateConfigFiles" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('adm', 'OnResetParsedData');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/> <inp2:m_Phrase name="la_text_Or"/>
+ <input type="button" class="button" onclick="Application.SetVar('validate_configs', 1); submit_event_without_init('adm', 'OnResetParsedData'); Application.SetVar('validate_configs', null);" value="<inp2:m_Phrase name="la_btn_ResetAndValidateConfigFiles" no_editing="1"/>"/>
</div>
<div class="group">
@@ -50,7 +50,7 @@
<strong><inp2:m_Phrase name="la_hint_SystemToolsCacheKeys"/></strong>: <strong><i><inp2:m_if check="adm_MemoryCacheEnabled">master:</inp2:m_if>sections_parsed</i></strong> (<inp2:m_if check="adm_MemoryCacheEnabled"><inp2:m_Phrase name="la_hint_SystemToolsMemoryCache"/><inp2:m_else/><inp2:m_Phrase name="la_hint_SystemToolsDatabaseCache"/></inp2:m_if>)
</div>
</div>
- <input type="button" class="button" onclick="submit_event('adm', 'OnResetSections');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('adm', 'OnResetSections');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/>
</div>
<div class="group">
@@ -58,7 +58,7 @@
<div class="hint">
<inp2:m_Phrase name="hint:la_title_SystemToolsRebuildMultilingualFields"/>
</div>
- <input type="button" class="button" onclick="submit_event('lang', 'OnReflectMultiLingualFields');" value="<inp2:m_Phrase name="la_btn_Rebuild" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('lang', 'OnReflectMultiLingualFields');" value="<inp2:m_Phrase name="la_btn_Rebuild" no_editing="1"/>"/>
</div>
<div class="group">
@@ -87,7 +87,7 @@
<strong><inp2:m_Phrase name="la_hint_SystemToolsCacheKeys"/></strong>: <strong><i><inp2:m_if check="adm_MemoryCacheEnabled">master:</inp2:m_if>config_files</i></strong>, <strong><i><inp2:m_if check="adm_MemoryCacheEnabled">master:</inp2:m_if>configs_parsed</i></strong> (<inp2:m_if check="adm_MemoryCacheEnabled"><inp2:m_Phrase name="la_hint_SystemToolsMemoryCache"/><inp2:m_else/><inp2:m_Phrase name="la_hint_SystemToolsDatabaseCache"/></inp2:m_if>)
</div>
</div>
- <input type="button" class="button" onclick="submit_event('adm', 'OnResetConfigsCache');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('adm', 'OnResetConfigsCache');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/>
</div>
</div>
</div>
@@ -102,7 +102,7 @@
<div class="hint">
<inp2:m_Phrase name="hint:la_title_SystemToolsResetModRewriteCache"/>
</div>
- <input type="button" class="button" onclick="submit_event('adm', 'OnResetModRwCache');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('adm', 'OnResetModRwCache');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/>
</div>
<div class="group last">
@@ -113,7 +113,7 @@
<strong><inp2:m_Phrase name="la_hint_SystemToolsCacheKeys"/></strong>: <strong><i><inp2:m_if check="adm_MemoryCacheEnabled">master:</inp2:m_if>cms_menu</i></strong>, <strong><i><inp2:m_if check="adm_MemoryCacheEnabled">master:</inp2:m_if>template_mapping</i></strong>, <strong><i><inp2:m_if check="adm_MemoryCacheEnabled">master:</inp2:m_if>StructureTree</i></strong> (<inp2:m_if check="adm_MemoryCacheEnabled"><inp2:m_Phrase name="la_hint_SystemToolsMemoryCache"/><inp2:m_else/><inp2:m_Phrase name="la_hint_SystemToolsDatabaseCache"/></inp2:m_if>)
</div>
</div>
- <input type="button" class="button" onclick="submit_event('c', 'OnResetCMSMenuCache');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('c', 'OnResetCMSMenuCache');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/>
</div>
</div>
</div>
@@ -130,7 +130,7 @@
<div class="hint">
<inp2:m_Phrase name="hint:la_title_SystemToolsSynchronizeDBRevisions"/>
</div>
- <input type="button" class="button" onclick="submit_event('adm', 'OnSynchronizeDBRevisions');" value="<inp2:m_Phrase name="la_btn_Synchronize" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('adm', 'OnSynchronizeDBRevisions');" value="<inp2:m_Phrase name="la_btn_Synchronize" no_editing="1"/>"/>
</div>
<div class="group last">
@@ -138,7 +138,7 @@
<div class="hint">
<inp2:m_Phrase name="hint:la_title_SystemToolsDeploy"/>
</div>
- <input type="button" class="button" onclick="submit_event('adm', 'OnDeploy');" value="<inp2:m_Phrase name="la_btn_Deploy" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('adm', 'OnDeploy');" value="<inp2:m_Phrase name="la_btn_Deploy" no_editing="1"/>"/>
</div>
</div>
</div>
@@ -153,7 +153,7 @@
<div class="hint">
<inp2:m_Phrase name="hint:la_title_SystemToolsRefreshThemeFiles"/>
</div>
- <input type="button" class="button" onclick="submit_event('adm', 'OnRebuildThemes');" value="<inp2:m_Phrase name="la_btn_Refresh" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('adm', 'OnRebuildThemes');" value="<inp2:m_Phrase name="la_btn_Refresh" no_editing="1"/>"/>
</div>
<div class="group">
@@ -169,7 +169,7 @@
<div class="hint">
<inp2:m_Phrase name="hint:la_title_SystemToolsClearTemplatesCache"/>
</div>
- <input type="button" class="button" onclick="submit_event('adm', 'OnDeleteCompiledTemplates');" value="<inp2:m_Phrase name="la_btn_Clear" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('adm', 'OnDeleteCompiledTemplates');" value="<inp2:m_Phrase name="la_btn_Clear" no_editing="1"/>"/>
</div>
</div>
</div>
@@ -185,7 +185,7 @@
<div class="hint">
<inp2:m_Phrase name="hint:la_title_SystemToolsResetAllKeys"/>
</div>
- <input type="button" class="button" onclick="submit_event('adm', 'OnResetMemcache');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/>
+ <input type="button" class="button" onclick="submit_event_without_init('adm', 'OnResetMemcache');" value="<inp2:m_Phrase name="la_btn_Reset" no_editing="1"/>"/>
</div>
<div class="group">
@@ -232,6 +232,12 @@
getFrame('menu').location.reload();
</inp2:m_if>
+ function submit_event_without_init(prefix_special, event, t, form_action, $ajax)
+ {
+ Application.SetVar('full_init', 0);
+ submit_event(prefix_special, event, t, form_action, $ajax);
+ }
+
<inp2:m_if check="adm_MemoryCacheEnabled">
$(document).ready(
function () {
@@ -307,4 +313,4 @@
</inp2:m_if>
</script>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: core/kernel/application.php
===================================================================
--- core/kernel/application.php
+++ core/kernel/application.php
@@ -381,7 +381,9 @@
$this->InitDone = true;
- $this->HandleEvent(new kEvent('adm:OnStartup'));
+ if ( $this->GetVar('full_init', 1) ) {
+ $this->HandleEvent(new kEvent('adm:OnStartup'));
+ }
return true;
}
Index: tools/run_event.php
===================================================================
--- tools/run_event.php
+++ tools/run_event.php
@@ -36,6 +36,10 @@
include_once(FULL_PATH . '/core/kernel/startup.php');
+if ( $argv[1] === 'adm:OnDeploy' ) {
+ $_GET['full_init'] = 0;
+}
+
$application =& kApplication::Instance();
$application->Init();
@@ -58,4 +62,4 @@
exit($code);
}
-$end = microtime(true);
\ No newline at end of file
+$end = microtime(true);

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server