From 2c487e9fc1ca8c96352825b044a1be87f8f85c65 Mon Sep 17 00:00:00 2001
From: Apex Liu <apex.liu@qq.com>
Date: Tue, 11 Sep 2018 03:33:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E4=BB=8E=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=84=E4=B8=AD=E7=A7=BB=E9=99=A4=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E5=9B=A0=E6=95=B0=E6=8D=AE=E5=BA=93=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=A4=B1=E8=B4=A5=E8=80=8C=E6=97=A0=E6=B3=95=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/www/teleport/static/js/tp-assist.js        | 4 ++--
 server/www/teleport/view/maintenance/install.mako | 2 +-
 server/www/teleport/view/page_login_base.mako     | 2 +-
 server/www/teleport/view/user/reset-password.mako | 2 +-
 server/www/teleport/webroot/app/model/group.py    | 5 +++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/www/teleport/static/js/tp-assist.js b/server/www/teleport/static/js/tp-assist.js
index 27fda57..0f0811e 100644
--- a/server/www/teleport/static/js/tp-assist.js
+++ b/server/www/teleport/static/js/tp-assist.js
@@ -34,7 +34,7 @@ $assist.init = function (cb_stack) {
             // if (version_compare()) {
             //     error_process(ret, func_success, func_error);
             // } else {
-            //     func_error(ret, TPE_OLD_ASSIST, '助手版本太低，请<a style="color:#aaaaff;" target="_blank" href="http://teleport.eomsoft.net/download">下载最新版本</a>！');
+            //     func_error(ret, TPE_OLD_ASSIST, '助手版本太低，请<a style="color:#aaaaff;" target="_blank" href="http://tp4a.com/download">下载最新版本</a>！');
             // }
         },
         error: function () {
@@ -68,7 +68,7 @@ $assist._make_message_box = function () {
         '<div class="alert alert-info" role="alert">',
         '<p>需要TELEPORT助手来辅助远程连接，请确认本机运行了TELEPORT助手！</p>',
         '</div>',
-        '<p>如果您尚未运行TELEPORT助手，请 <a href="http://teleport.eomsoft.net/download" target="_blank"><strong>下载最新版TELEPORT助手</strong></a> 并安装。一旦运行了TELEPORT助手，即可重新进行远程连接。</p>',
+        '<p>如果您尚未运行TELEPORT助手，请 <a href="http://tp4a.com/download" target="_blank"><strong>下载最新版TELEPORT助手</strong></a> 并安装。一旦运行了TELEPORT助手，即可重新进行远程连接。</p>',
         '</div>',
         '<div class="modal-footer">',
         '<button type="button" class="btn btn-sm btn-default" data-dismiss="modal"><i class="fa fa-times fa-fw"></i> 我知道了</button>',
diff --git a/server/www/teleport/view/maintenance/install.mako b/server/www/teleport/view/maintenance/install.mako
index 8117ccc..55bef0e 100644
--- a/server/www/teleport/view/maintenance/install.mako
+++ b/server/www/teleport/view/maintenance/install.mako
@@ -39,7 +39,7 @@
         <table id="db-info" class="table"></table>
         <div class="alert alert-warning">
             <i class="fas fa-exclamation-triangle"></i> 注意：如果以上配置并不是您所期望的，请修改您的配置文件，然后刷新本页面。
-            <a href="https://github.com/eomsoft/teleport/wiki/deployment-config" target="_blank">如何设置配置文件？</a>
+            <a href="https://docs.tp4a.com/config/" target="_blank">如何设置配置文件？</a>
         </div>
     </div>
 
diff --git a/server/www/teleport/view/page_login_base.mako b/server/www/teleport/view/page_login_base.mako
index 42e0a59..ee5c796 100644
--- a/server/www/teleport/view/page_login_base.mako
+++ b/server/www/teleport/view/page_login_base.mako
@@ -36,7 +36,7 @@
             <nav class="navbar navbar-fixed-top">
                 <div class="container">
                     <ul>
-                        <li><a href="/" class="logo"><img src="${ static_url('img/site-logo.png') }" alt="TELEPORT，触维软件旗下产品。"/></a></li>
+                        <li><a href="/" class="logo"><img src="${ static_url('img/site-logo.png') }" alt="TELEPORT"/></a></li>
                         <li>
                             <div class="desc">连接 &middot; 尽在指掌中</div>
                         </li>
diff --git a/server/www/teleport/view/user/reset-password.mako b/server/www/teleport/view/user/reset-password.mako
index f37c428..0b7c8a5 100644
--- a/server/www/teleport/view/user/reset-password.mako
+++ b/server/www/teleport/view/user/reset-password.mako
@@ -30,7 +30,7 @@
             </ol>
         </div>
     </div>
-##     <a href="http://teleport.eomsoft.net" target="_blank"><span class="logo"></span></a>
+##     <a href="http://tp4a.com/" target="_blank"><span class="logo"></span></a>
 </%block>
 
 <div class="page-content">
diff --git a/server/www/teleport/webroot/app/model/group.py b/server/www/teleport/webroot/app/model/group.py
index 70d157d..9afdd4f 100644
--- a/server/www/teleport/webroot/app/model/group.py
+++ b/server/www/teleport/webroot/app/model/group.py
@@ -236,8 +236,9 @@ def remove_members(gtype, gid, members):
     sql_list.append(sql)
     sql = 'DELETE FROM `{}ops_map` WHERE {gname}_id={gid} AND {name}_id IN ({ids});'.format(db.table_prefix, gname=gname, name=name, gid=gid, ids=mids)
     sql_list.append(sql)
-    sql = 'DELETE FROM `{}audit_map` WHERE {gname}_id={gid} AND {name}_id IN ({ids});'.format(db.table_prefix, gname=gname, name=name, gid=gid, ids=mids)
-    sql_list.append(sql)
+    if gtype != TP_GROUP_ACCOUNT:
+        sql = 'DELETE FROM `{}audit_map` WHERE {gname}_id={gid} AND {name}_id IN ({ids});'.format(db.table_prefix, gname=gname, name=name, gid=gid, ids=mids)
+        sql_list.append(sql)
 
     if db.transaction(sql_list):
         return TPE_OK