From 4baf52bb81c37ecacea0e6e63ec9c3867920153f Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 6 May 2019 18:25:35 +0800
Subject: [PATCH]  * adjust for merge xuanxuan.

---
 Makefile                  | 1 +
 module/story/js/x.view.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e9852d8c3a..a17d7a859f 100644
--- a/Makefile
+++ b/Makefile
@@ -95,6 +95,7 @@ zentaoxx:
 	sed -i "s/marked\.html\.php';?>/marked\.html\.php';?>\n<div id='mainMenu' class='clearfix'><div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('xuanxuan');?><\/div><\/div>/g" zentaoxx/module/client/view/checkupgrade.html.php
 	sed -i '/var serverVersions/d' zentaoxx/module/client/js/checkupgrade.js
 	sed -i '/var currentVersion/d' zentaoxx/module/client/js/checkupgrade.js
+	sed -i '/setRequiredFields(/d' zentaoxx/module/common/view/header.modal.html.php
 	sed -i 's/v\.//g' zentaoxx/module/client/js/checkupgrade.js
 	sed -i 's/xxb_/zt_/g' zentaoxx/db/*.sql
 	mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php
diff --git a/module/story/js/x.view.js b/module/story/js/x.view.js
index 9df20df06e..7f5b52bef1 100644
--- a/module/story/js/x.view.js
+++ b/module/story/js/x.view.js
@@ -15,7 +15,7 @@ $(function()
         if(href.indexOf('browse') >= 0 || href.indexOf('batchCreate') >= 0 
             || href.indexOf('create') >= 0 || href.indexOf('delete') >= 0) return true;
 
-        if(href.indexOf('activate') >= 0 || href.indexOf('close') >= 0) 
+        if($that.hasClass('iframe'))
         {
             url = href;
             target = '';