From b9fda95ee7bf36c864dcfdc1e75154ebb5e001f2 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 3 Jan 2020 17:29:45 +0800
Subject: [PATCH]  * adjust for show modal.

---
 module/block/view/dashboard.html.php                         | 2 ++
 .../module/block/ext/view/dashboard.xuanxuan.html.hook.php   | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php
index 24fb2806ab..4dffa8ede6 100644
--- a/module/block/view/dashboard.html.php
+++ b/module/block/view/dashboard.html.php
@@ -122,12 +122,14 @@ $(function()
 })
 <?php endif;?>
 <?php endif;?>
+<?php $showedModal = false;?>
 <?php if(!empty($config->global->showAnnual) and empty($config->global->annualShowed)):?>
 <?php $this->app->loadLang('misc');?>
 var myModalTrigger = new $.zui.ModalTrigger({title:'<?php echo $lang->misc->showAnnual;?>', custom: function(){return <?php echo json_encode(sprintf($lang->misc->annualDesc, $this->createLink('report', 'annualData')));?>}});
 var result = myModalTrigger.show();
 $('#showAnnual').click(function(){myModalTrigger.close()});
 <?php $this->loadModel('setting')->setItem("{$this->app->user->account}.common.global.annualShowed", 1);?>
+<?php $showedModal = true;?>
 <?php endif;?>
 </script>
 <?php if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();}?>
diff --git a/xuanxuan/module/block/ext/view/dashboard.xuanxuan.html.hook.php b/xuanxuan/module/block/ext/view/dashboard.xuanxuan.html.hook.php
index a26d853403..2afc68886a 100755
--- a/xuanxuan/module/block/ext/view/dashboard.xuanxuan.html.hook.php
+++ b/xuanxuan/module/block/ext/view/dashboard.xuanxuan.html.hook.php
@@ -4,13 +4,14 @@ $this->app->loadLang('im');
 $account = str_replace('.', '_', $this->app->user->account);
 $xxInstalled = $account . 'installed';
 ?>
-<?php if(isset($config->xxserver->installed) and $config->xuanxuan->turnon and !isset($config->xxclient->$xxInstalled) and $config->global->flow == 'full' ):?>
+<?php if(!$showedModal and isset($config->xxserver->installed) and $config->xuanxuan->turnon and !isset($config->xxclient->$xxInstalled) and $config->global->flow == 'full' ):?>
 var myModalTrigger = new $.zui.ModalTrigger({custom: '<?php echo $lang->im->xxClientConfirm;?>', title: '<?php echo $lang->im->zentaoClient;?>'});
 var result = myModalTrigger.show();
 <?php $this->loadModel('setting')->setItem("system.common.xxclient.{$account}installed", 1);?>
+<?php $showedModal = true;?>
 <?php endif;?>
 
-<?php if(!isset($config->xxserver->noticed) and $this->app->user->admin and $config->global->flow == 'full' and $config->$module->block->initVersion >= '2'):?>
+<?php if(!$showedModal and !isset($config->xxserver->noticed) and $this->app->user->admin and $config->global->flow == 'full' and $config->$module->block->initVersion >= '2'):?>
 var myModalTrigger = new $.zui.ModalTrigger({custom: '<?php echo $lang->im->xxServerConfirm;?>', title: '<?php echo $lang->im->zentaoClient;?>'});
 var result = myModalTrigger.show();
 <?php $this->loadModel('setting')->setItem("system.common.xxserver.noticed", 1);?>