* Fix bug#20886,16610

module/group/control.php

@@ -181,7 +181,8 @@ class group extends control
             if($type == 'byModule') $result = $this->group->updatePrivByModule();
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            return print(js::alert($this->lang->saveSuccess) . js::execute('window.parent.location.reload()'));
+            if($type == 'byGroup') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
+            if($type == 'byModule') return print(js::alert($this->lang->saveSuccess) . js::execute('window.parent.location.reload()'));
         }
 
         if($type == 'byGroup')

module/user/lang/zh-cn.php

@@ -221,7 +221,7 @@ $lang->user->error->account        = "【ID %s】的用户名应该为：三位
 $lang->user->error->accountDupl    = "【ID %s】的用户名已经存在";
 $lang->user->error->realname       = "【ID %s】的真实姓名必须填写";
 $lang->user->error->visions        = "【ID %s】的界面类型必须填写";
-$lang->user->error->password       = "【ID %s】的密码必须为六位以上";
+$lang->user->error->password       = "【ID %s】的密码必须为六位及以上";
 $lang->user->error->mail           = "【ID %s】的邮箱地址不正确";
 $lang->user->error->reserved       = "【ID %s】的用户名已被系统预留";
 $lang->user->error->weakPassword   = "【ID %s】的密码强度小于系统设定。";

module/user/lang/zh-tw.php

@@ -218,7 +218,7 @@ $lang->user->error = new stdclass();
 $lang->user->error->account        = "【ID %s】的用戶名應該為：三位以上的英文、數字或下劃線的組合";
 $lang->user->error->accountDupl    = "【ID %s】的用戶名已經存在";
 $lang->user->error->realname       = "【ID %s】的真實姓名必須填寫";
-$lang->user->error->password       = "【ID %s】的密碼必須為六位以上";
+$lang->user->error->password       = "【ID %s】的密碼必須為六位及以上";
 $lang->user->error->mail           = "【ID %s】的郵箱地址不正確";
 $lang->user->error->reserved       = "【ID %s】的用戶名已被系統預留";
 $lang->user->error->weakPassword   = "【ID %s】的密碼強度小於系統設定。";