Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x

Browse Source
This commit is contained in:
z
2020-09-21 16:59:14 +08:00
parent bcb0e7732c b92156a283
commit d91c3b1361
20 changed files with 164 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update11.3.sql
+1 -1
View File
@@ -1 +1 @@
ALTER TABLE `zt_case` ADD `fromCaseVersion` mediumint(8) unsigned NOT NULL AFTER `fromCaseID`;
ALTER TABLE `zt_case` ADD `fromCaseVersion` mediumint(8) unsigned NOT NULL default '1' AFTER `fromCaseID`;
db/zentao.sql
+1 -1
View File
@@ -177,7 +177,7 @@ CREATE TABLE IF NOT EXISTS `zt_case` (
`linkCase` varchar(255) NOT NULL,
`fromBug` mediumint(8) unsigned NOT NULL,
`fromCaseID` mediumint(8) unsigned NOT NULL,
`fromCaseVersion` mediumint(8) unsigned NOT NULL,
`fromCaseVersion` mediumint(8) unsigned NOT NULL default '1',
`deleted` enum('0','1') NOT NULL default '0',
`lastRunner` varchar(30) NOT NULL,
`lastRunDate` datetime NOT NULL,
module/admin/control.php
+3 -3
View File
@@ -77,7 +77,7 @@ class admin extends control
$this->setting->deleteItems('owner=system&module=common&section=global&key=ztPrivateKey');
$this->setting->setItems('system.common.global', $data);
echo js::alert($this->lang->admin->register->success);
echo js::alert($this->lang->admin->registerNotice->success);
if($from == 'admin') die(js::locate(inlink('index'), 'parent'));
if($from == 'mail') die(js::locate($this->createLink('mail', 'ztcloud'), 'parent'));
}
@@ -95,8 +95,8 @@ class admin extends control
die(js::alert($alertMessage));
}
$this->view->title = $this->lang->admin->register->caption;
$this->view->position[] = $this->lang->admin->register->caption;
$this->view->title = $this->lang->admin->registerNotice->caption;
$this->view->position[] = $this->lang->admin->registerNotice->caption;
$this->view->register = $this->admin->getRegisterInfo();
$this->view->sn = $this->config->global->sn;
$this->view->from = $from;
module/admin/lang/de.php
+22 -22
View File
@@ -9,19 +9,19 @@
* @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->admin->common = 'Admin';
$lang->admin->index = 'Admin Home';
$lang->admin->checkDB = 'Datenbank prüfen';
$lang->admin->sso = 'SSO';
$lang->admin->ssoAction = 'Link Zdoo';
$lang->admin->safeIndex = 'Sicherheit';
$lang->admin->checkWeak = 'Schwache Passwörter prüfen';
$lang->admin->certifyMobile = 'Prüfen Sie die Mobilnummer';
$lang->admin->certifyEmail = 'Prüfen Sie die Emailadresse';
$lang->admin->ztCompany = 'Prüfen Sie das Unternehmen';
$lang->admin->captcha = 'Bestätigungscode';
$lang->admin->getCaptcha = 'Bestätigungscode anfordern';
$lang->admin->registerAction = 'Register';
$lang->admin->common = 'Admin';
$lang->admin->index = 'Admin Home';
$lang->admin->checkDB = 'Datenbank prüfen';
$lang->admin->sso = 'SSO';
$lang->admin->ssoAction = 'Link Zdoo';
$lang->admin->safeIndex = 'Sicherheit';
$lang->admin->checkWeak = 'Schwache Passwörter prüfen';
$lang->admin->certifyMobile = 'Prüfen Sie die Mobilnummer';
$lang->admin->certifyEmail = 'Prüfen Sie die Emailadresse';
$lang->admin->ztCompany = 'Prüfen Sie das Unternehmen';
$lang->admin->captcha = 'Bestätigungscode';
$lang->admin->getCaptcha = 'Bestätigungscode anfordern';
$lang->admin->register = 'Register';
$lang->admin->api = 'API';
$lang->admin->log = 'Log';
@@ -39,15 +39,15 @@ $lang->admin->notice->register = "Hinweiß: Sie haben sich nicht bei ZenTao (www
$lang->admin->notice->ignore = "Ignorieren";
$lang->admin->notice->int = "『%s』sollte eine positive Zahl sein.";
$lang->admin->register = new stdclass();
$lang->admin->register->common = 'Verbinde neues Konto';
$lang->admin->register->caption = 'In der Zentao Community registieren';
$lang->admin->register->click = 'Bitte registieren Sie sich hier';
$lang->admin->register->lblAccount = 'mindestens 3 Zeichen bitte; mit Buchsten und Ziffern.';
$lang->admin->register->lblPasswd = 'mindestens 6 Zeichen bitte; mit Buchsten und Ziffern.';
$lang->admin->register->submit = 'Registieren';
$lang->admin->register->bind = "Verbinde bestehendes Konto";
$lang->admin->register->success = "Sie haben sich erfolgreich registriert!";
$lang->admin->registerNotice = new stdclass();
$lang->admin->registerNotice->common = 'Verbinde neues Konto';
$lang->admin->registerNotice->caption = 'In der Zentao Community registieren';
$lang->admin->registerNotice->click = 'Bitte registieren Sie sich hier';
$lang->admin->registerNotice->lblAccount = 'mindestens 3 Zeichen bitte; mit Buchsten und Ziffern.';
$lang->admin->registerNotice->lblPasswd = 'mindestens 6 Zeichen bitte; mit Buchsten und Ziffern.';
$lang->admin->registerNotice->submit = 'Registieren';
$lang->admin->registerNotice->bind = "Verbinde bestehendes Konto";
$lang->admin->registerNotice->success = "Sie haben sich erfolgreich registriert!";
$lang->admin->bind = new stdclass();
$lang->admin->bind->caption = 'Konto verknüpfen';
module/admin/lang/en.php
+22 -22
View File
@@ -9,19 +9,19 @@
* @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
$lang->admin->common = 'Admin';
$lang->admin->index = 'Admin Home';
$lang->admin->checkDB = 'Check Database';
$lang->admin->sso = 'Zdoo';
$lang->admin->ssoAction = 'Link Zdoo';
$lang->admin->safeIndex = 'Security';
$lang->admin->checkWeak = 'Check Weak Password';
$lang->admin->certifyMobile = 'Verify your cellphone';
$lang->admin->certifyEmail = 'Verify your Email';
$lang->admin->ztCompany = 'Verify your company';
$lang->admin->captcha = 'Verification Code';
$lang->admin->getCaptcha = 'Send Verification Code';
$lang->admin->registerAction = 'Register';
$lang->admin->common = 'Admin';
$lang->admin->index = 'Admin Home';
$lang->admin->checkDB = 'Check Database';
$lang->admin->sso = 'Zdoo';
$lang->admin->ssoAction = 'Link Zdoo';
$lang->admin->safeIndex = 'Security';
$lang->admin->checkWeak = 'Check Weak Password';
$lang->admin->certifyMobile = 'Verify your cellphone';
$lang->admin->certifyEmail = 'Verify your Email';
$lang->admin->ztCompany = 'Verify your company';
$lang->admin->captcha = 'Verification Code';
$lang->admin->getCaptcha = 'Send Verification Code';
$lang->admin->register = 'Register';
$lang->admin->api = 'API';
$lang->admin->log = 'Log';
@@ -39,15 +39,15 @@ $lang->admin->notice->register = "Note: You haven't registered in ZenTao officia
$lang->admin->notice->ignore = "Ignore";
$lang->admin->notice->int = "『%s』should be a positive integer.";
$lang->admin->register = new stdclass();
$lang->admin->register->common = 'Bind Account';
$lang->admin->register->caption = 'ZenTao Community Signup';
$lang->admin->register->click = 'Sign Up';
$lang->admin->register->lblAccount = '>= 3 letters and numbers';
$lang->admin->register->lblPasswd = '>= 6 letters and numbers';
$lang->admin->register->submit = 'Submit';
$lang->admin->register->bind = "Bind Exsiting Account";
$lang->admin->register->success = "You have signed up!";
$lang->admin->registerNotice = new stdclass();
$lang->admin->registerNotice->common = 'Bind Account';
$lang->admin->registerNotice->caption = 'ZenTao Community Signup';
$lang->admin->registerNotice->click = 'Sign Up';
$lang->admin->registerNotice->lblAccount = '>= 3 letters and numbers';
$lang->admin->registerNotice->lblPasswd = '>= 6 letters and numbers';
$lang->admin->registerNotice->submit = 'Submit';
$lang->admin->registerNotice->bind = "Bind Exsiting Account";
$lang->admin->registerNotice->success = "You have signed up!";
$lang->admin->bind = new stdclass();
$lang->admin->bind->caption = 'Link Account';
module/admin/lang/fr.php
+22 -22
View File
@@ -9,19 +9,19 @@
* @version $Id: en.php 4460 2013-02-26 02:28:02Z chencongzhi520@gmail.com $
* @link https://www.zentao.pm
*/
$lang->admin->common = 'Admin';
$lang->admin->index = 'Admin Home';
$lang->admin->checkDB = 'Check Database';
$lang->admin->sso = 'Zdoo';
$lang->admin->ssoAction = 'Link Zdoo';
$lang->admin->safeIndex = 'Sécurité';
$lang->admin->checkWeak = 'Contrôle niveau de sécurité des mots de passe';
$lang->admin->certifyMobile = 'Vérifier votre smartphone';
$lang->admin->certifyEmail = 'Vérifier votre Email';
$lang->admin->ztCompany = 'Vérifier votre entreprise';
$lang->admin->captcha = 'Code de vérification';
$lang->admin->getCaptcha = 'Obtenir le Code de vérification';
$lang->admin->registerAction = 'Register';
$lang->admin->common = 'Admin';
$lang->admin->index = 'Admin Home';
$lang->admin->checkDB = 'Check Database';
$lang->admin->sso = 'Zdoo';
$lang->admin->ssoAction = 'Link Zdoo';
$lang->admin->safeIndex = 'Sécurité';
$lang->admin->checkWeak = 'Contrôle niveau de sécurité des mots de passe';
$lang->admin->certifyMobile = 'Vérifier votre smartphone';
$lang->admin->certifyEmail = 'Vérifier votre Email';
$lang->admin->ztCompany = 'Vérifier votre entreprise';
$lang->admin->captcha = 'Code de vérification';
$lang->admin->getCaptcha = 'Obtenir le Code de vérification';
$lang->admin->register = 'Register';
$lang->admin->api = 'API';
$lang->admin->log = 'Log';
@@ -39,15 +39,15 @@ $lang->admin->notice->register = "Note: Vous n'êtes pas enregistré sur le site
$lang->admin->notice->ignore = "Ignorer";
$lang->admin->notice->int = "『 %s 』 devrait être un entier positif.";
$lang->admin->register = new stdclass();
$lang->admin->register->common = 'Connectez-vous avec votre nouveau compte';
$lang->admin->register->caption = "S'enregistrer sur la communauté Zentao";
$lang->admin->register->click = "S'enregistrer ici";
$lang->admin->register->lblAccount = '>= 3 lettres et chiffres';
$lang->admin->register->lblPasswd = '>= 6 lettres et chiffres';
$lang->admin->register->submit = "S'enregistrer";
$lang->admin->register->bind = "S'associer à un compte existant";
$lang->admin->register->success = "Vous êtes enregistré !";
$lang->admin->registerNotice = new stdclass();
$lang->admin->registerNotice->common = 'Connectez-vous avec votre nouveau compte';
$lang->admin->registerNotice->caption = "S'enregistrer sur la communauté Zentao";
$lang->admin->registerNotice->click = "S'enregistrer ici";
$lang->admin->registerNotice->lblAccount = '>= 3 lettres et chiffres';
$lang->admin->registerNotice->lblPasswd = '>= 6 lettres et chiffres';
$lang->admin->registerNotice->submit = "S'enregistrer";
$lang->admin->registerNotice->bind = "S'associer à un compte existant";
$lang->admin->registerNotice->success = "Vous êtes enregistré !";
$lang->admin->bind = new stdclass();
$lang->admin->bind->caption = 'Lier au compte';
module/admin/lang/vi.php
+22 -22
View File
@@ -9,19 +9,19 @@
* @version $Id: vi.php 4460 2013-02-26 02:28:02Z quocnho@gmail.com $
* @link http://www.zentao.net
*/
$lang->admin->common = 'Quản trị';
$lang->admin->index = 'Trang quản trị';
$lang->admin->checkDB = 'Kiểm tra CSDL';
$lang->admin->sso = 'Zdoo';
$lang->admin->ssoAction = 'Liên kết Zdoo';
$lang->admin->safeIndex = 'Bảo mật';
$lang->admin->checkWeak = 'Kiểm tra độ yếu mật khẩu';
$lang->admin->certifyMobile = 'Xác thực di động của bạn';
$lang->admin->certifyEmail = 'Xác thực email của bạn';
$lang->admin->ztCompany = 'Xác thực doanh nghiệp của bạn';
$lang->admin->captcha = 'Mã xác thực';
$lang->admin->getCaptcha = 'Gửi Mã xác thực';
$lang->admin->registerAction = 'Register';
$lang->admin->common = 'Quản trị';
$lang->admin->index = 'Trang quản trị';
$lang->admin->checkDB = 'Kiểm tra CSDL';
$lang->admin->sso = 'Zdoo';
$lang->admin->ssoAction = 'Liên kết Zdoo';
$lang->admin->safeIndex = 'Bảo mật';
$lang->admin->checkWeak = 'Kiểm tra độ yếu mật khẩu';
$lang->admin->certifyMobile = 'Xác thực di động của bạn';
$lang->admin->certifyEmail = 'Xác thực email của bạn';
$lang->admin->ztCompany = 'Xác thực doanh nghiệp của bạn';
$lang->admin->captcha = 'Mã xác thực';
$lang->admin->getCaptcha = 'Gửi Mã xác thực';
$lang->admin->register = 'Register';
$lang->admin->api = 'API';
$lang->admin->log = 'Nhật ký';
@@ -39,15 +39,15 @@ $lang->admin->notice->register = "Chú ý: Bạn chưa đăng ký trên trang we
$lang->admin->notice->ignore = "Bỏ qua";
$lang->admin->notice->int = "『%s』 nên là số nguyên dương.";
$lang->admin->register = new stdclass();
$lang->admin->register->common = 'Kết nối tài khoản';
$lang->admin->register->caption = 'Đăng ký cộng đồng ZenTao';
$lang->admin->register->click = 'Đăng ký';
$lang->admin->register->lblAccount = '>= 3 chữ và số';
$lang->admin->register->lblPasswd = '>= 6 chữ và số';
$lang->admin->register->submit = 'Gửi';
$lang->admin->register->bind = "Kết nối với tài khoản đang tồn tại";
$lang->admin->register->success = "Bạn đã đăng ký!";
$lang->admin->registerNotice = new stdclass();
$lang->admin->registerNotice->common = 'Kết nối tài khoản';
$lang->admin->registerNotice->caption = 'Đăng ký cộng đồng ZenTao';
$lang->admin->registerNotice->click = 'Đăng ký';
$lang->admin->registerNotice->lblAccount = '>= 3 chữ và số';
$lang->admin->registerNotice->lblPasswd = '>= 6 chữ và số';
$lang->admin->registerNotice->submit = 'Gửi';
$lang->admin->registerNotice->bind = "Kết nối với tài khoản đang tồn tại";
$lang->admin->registerNotice->success = "Bạn đã đăng ký!";
$lang->admin->bind = new stdclass();
$lang->admin->bind->caption = 'Liên kết tài khoản';
module/admin/lang/zh-cn.php
+22 -22
View File
@@ -9,19 +9,19 @@
* @version $Id: zh-cn.php 4767 2013-05-05 06:10:13Z wwccss $
* @link http://www.zentao.net
*/
$lang->admin->common = '后台管理';
$lang->admin->index = '后台管理首页';
$lang->admin->checkDB = '检查数据库';
$lang->admin->sso = 'ZDOO集成';
$lang->admin->ssoAction = 'ZDOO集成';
$lang->admin->safeIndex = '安全';
$lang->admin->checkWeak = '弱口令检查';
$lang->admin->certifyMobile = '认证手机';
$lang->admin->certifyEmail = '认证邮箱';
$lang->admin->ztCompany = '认证公司';
$lang->admin->captcha = '验证码';
$lang->admin->getCaptcha = '获取验证码';
$lang->admin->registerAction = '登记';
$lang->admin->common = '后台管理';
$lang->admin->index = '后台管理首页';
$lang->admin->checkDB = '检查数据库';
$lang->admin->sso = 'ZDOO集成';
$lang->admin->ssoAction = 'ZDOO集成';
$lang->admin->safeIndex = '安全';
$lang->admin->checkWeak = '弱口令检查';
$lang->admin->certifyMobile = '认证手机';
$lang->admin->certifyEmail = '认证邮箱';
$lang->admin->ztCompany = '认证公司';
$lang->admin->captcha = '验证码';
$lang->admin->getCaptcha = '获取验证码';
$lang->admin->register = '登记';
$lang->admin->api = '接口';
$lang->admin->log = '日志';
@@ -39,15 +39,15 @@ $lang->admin->notice->register = "友情提示：您还未在禅道社区(www.ze
$lang->admin->notice->ignore = "不再提示";
$lang->admin->notice->int = "『%s』应当是正整数。";
$lang->admin->register = new stdclass();
$lang->admin->register->common = '注册新帐号绑定';
$lang->admin->register->caption = '禅道社区登记';
$lang->admin->register->click = '点击此处';
$lang->admin->register->lblAccount = '请设置您的用户名，英文字母和数字的组合，三位以上。';
$lang->admin->register->lblPasswd = '请设置您的密码。数字和字母的组合，六位以上。';
$lang->admin->register->submit = '登记';
$lang->admin->register->bind = "绑定已有帐号";
$lang->admin->register->success = "登记账户成功";
$lang->admin->registerNotice = new stdclass();
$lang->admin->registerNotice->common = '注册新帐号绑定';
$lang->admin->registerNotice->caption = '禅道社区登记';
$lang->admin->registerNotice->click = '点击此处';
$lang->admin->registerNotice->lblAccount = '请设置您的用户名，英文字母和数字的组合，三位以上。';
$lang->admin->registerNotice->lblPasswd = '请设置您的密码。数字和字母的组合，六位以上。';
$lang->admin->registerNotice->submit = '登记';
$lang->admin->registerNotice->bind = "绑定已有帐号";
$lang->admin->registerNotice->success = "登记账户成功";
$lang->admin->bind = new stdclass();
$lang->admin->bind->caption = '关联社区帐号';
module/admin/lang/zh-tw.php
+22 -22
View File
@@ -9,19 +9,19 @@
* @version $Id: zh-tw.php 4767 2013-05-05 06:10:13Z wwccss $
* @link http://www.zentao.net
*/
$lang->admin->common = '後台管理';
$lang->admin->index = '後台管理首頁';
$lang->admin->checkDB = '檢查資料庫';
$lang->admin->sso = 'ZDOO整合';
$lang->admin->ssoAction = 'ZDOO整合';
$lang->admin->safeIndex = '安全';
$lang->admin->checkWeak = '弱口令檢查';
$lang->admin->certifyMobile = '認證手機';
$lang->admin->certifyEmail = '認證郵箱';
$lang->admin->ztCompany = '認證公司';
$lang->admin->captcha = '驗證碼';
$lang->admin->getCaptcha = '獲取驗證碼';
$lang->admin->registerAction = '登記';
$lang->admin->common = '後台管理';
$lang->admin->index = '後台管理首頁';
$lang->admin->checkDB = '檢查資料庫';
$lang->admin->sso = 'ZDOO整合';
$lang->admin->ssoAction = 'ZDOO整合';
$lang->admin->safeIndex = '安全';
$lang->admin->checkWeak = '弱口令檢查';
$lang->admin->certifyMobile = '認證手機';
$lang->admin->certifyEmail = '認證郵箱';
$lang->admin->ztCompany = '認證公司';
$lang->admin->captcha = '驗證碼';
$lang->admin->getCaptcha = '獲取驗證碼';
$lang->admin->register = '登記';
$lang->admin->api = '介面';
$lang->admin->log = '日誌';
@@ -39,15 +39,15 @@ $lang->admin->notice->register = "友情提示：您還未在禪道社區(www.ze
$lang->admin->notice->ignore = "不再提示";
$lang->admin->notice->int = "『%s』應當是正整數。";
$lang->admin->register = new stdclass();
$lang->admin->register->common = '註冊新帳號綁定';
$lang->admin->register->caption = '禪道社區登記';
$lang->admin->register->click = '點擊此處';
$lang->admin->register->lblAccount = '請設置您的用戶名，英文字母和數字的組合，三位以上。';
$lang->admin->register->lblPasswd = '請設置您的密碼。數字和字母的組合，六位以上。';
$lang->admin->register->submit = '登記';
$lang->admin->register->bind = "綁定已有帳號";
$lang->admin->register->success = "登記賬戶成功";
$lang->admin->registerNotice = new stdclass();
$lang->admin->registerNotice->common = '註冊新帳號綁定';
$lang->admin->registerNotice->caption = '禪道社區登記';
$lang->admin->registerNotice->click = '點擊此處';
$lang->admin->registerNotice->lblAccount = '請設置您的用戶名，英文字母和數字的組合，三位以上。';
$lang->admin->registerNotice->lblPasswd = '請設置您的密碼。數字和字母的組合，六位以上。';
$lang->admin->registerNotice->submit = '登記';
$lang->admin->registerNotice->bind = "綁定已有帳號";
$lang->admin->registerNotice->success = "登記賬戶成功";
$lang->admin->bind = new stdclass();
$lang->admin->bind->caption = '關聯社區帳號';
module/admin/view/index.html.php
+1 -1
View File
@@ -15,7 +15,7 @@
<?php if(!$bind and !$ignore and common::hasPriv('admin', 'register')):?>
<div id="notice" class='alert alert-success'>
<?php echo html::a(inlink('ignore'), '<i class="icon-close icon-sm"></i> ' . $lang->admin->notice->ignore, 'hiddenwin', 'class="close" data-dismiss="alert" style="font-size: 12px"');?>
<div class="content"><i class='icon-exclamation-sign'></i> <?php echo sprintf($lang->admin->notice->register, html::a(inlink('register'), $lang->admin->register->click, '', 'class="alert-link"'));?></div>
<div class="content"><i class='icon-exclamation-sign'></i> <?php echo sprintf($lang->admin->notice->register, html::a(inlink('register'), $lang->admin->registerNotice->click, '', 'class="alert-link"'));?></div>
</div>
<?php endif;?>
module/admin/view/register.html.php
+6 -6
View File
@@ -19,20 +19,20 @@
</style>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->admin->register->caption;?></span></span>
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->admin->registerNotice->caption;?></span></span>
</div>
</div>
<div id='mainContent' class='main-row'>
<div class='col-md-6'>
<div class='panel'>
<div class='panel-heading'><strong><?php echo $lang->admin->register->common?></strong></div>
<div class='panel-heading'><strong><?php echo $lang->admin->registerNotice->common?></strong></div>
<form class='mw-600px' method="post" target="hiddenwin">
<table align='center' class='table table-form'>
<tr>
<th class='w-100px'><?php echo $lang->user->account;?></th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::input('account', '', "class='form-control' placeholder='{$lang->admin->register->lblAccount}'");?>
<?php echo html::input('account', '', "class='form-control' placeholder='{$lang->admin->registerNotice->lblAccount}'");?>
</td>
</tr>
<tr>
@@ -75,7 +75,7 @@
<th><?php echo $lang->user->password;?></th>
<td>
<div class="required required-wrapper"></div>
<?php echo html::password('password1', '', "class='form-control' placeholder='{$lang->admin->register->lblPasswd}'");?>
<?php echo html::password('password1', '', "class='form-control' placeholder='{$lang->admin->registerNotice->lblPasswd}'");?>
</td>
</tr>
<tr>
@@ -87,7 +87,7 @@
</tr>
<tr>
<td colspan='2' class='text-center'>
<?php echo html::submitButton($lang->admin->register->submit) . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?>
<?php echo html::submitButton($lang->admin->registerNotice->submit) . html::hidden('sn', $sn) . html::hidden('bindSite', common::getSysURL());?>
</td>
</tr>
</table>
@@ -96,7 +96,7 @@
</div>
<div class='col-md-6'>
<div class='panel'>
<div class='panel-heading'><strong><?php echo $lang->admin->register->bind?></strong></div>
<div class='panel-heading'><strong><?php echo $lang->admin->registerNotice->bind?></strong></div>
<form class='mw-400px' method="post" target="hiddenwin" action='<?php echo inlink('bind', "from=$from")?>'>
<table align='center' class='table table-form'>
<tr>
module/group/lang/resource.php
+3 -1
View File
@@ -1000,7 +1000,8 @@ $lang->resource->admin->checkDB = 'checkDB';
$lang->resource->admin->safe = 'safeIndex';
$lang->resource->admin->checkWeak = 'checkWeak';
$lang->resource->admin->sso = 'ssoAction';
$lang->resource->admin->register = 'registerAction';
$lang->resource->admin->register = 'register';
$lang->resource->admin->ztCompany = 'ztCompany';
$lang->admin->methodOrder[0] = 'index';
$lang->admin->methodOrder[5] = 'checkDB';
@@ -1008,6 +1009,7 @@ $lang->admin->methodOrder[10] = 'safeIndex';
$lang->admin->methodOrder[15] = 'checkWeak';
$lang->admin->methodOrder[20] = 'sso';
$lang->admin->methodOrder[25] = 'register';
$lang->admin->methodOrder[30] = 'ztCompany';
/* Extension. */
$lang->resource->extension = new stdclass();
module/product/model.php
+1 -1
View File
@@ -43,7 +43,7 @@ class productModel extends model
}
if($currentMethod == 'report') $currentMethod = 'browse';
$selectHtml = $this->select($products, $productID, $currentModule, $currentMethod, $extra, $branch, $module, $moduleType);
$selectHtml = $this->app->getMethodName() == 'all' ? '' : $this->select($products, $productID, $currentModule, $currentMethod, $extra, $branch, $module, $moduleType);
$label = $this->lang->product->index;
if($this->config->global->flow != 'full') $label = $this->lang->product->all;
module/project/js/burn.js
+5 -1
View File
@@ -20,17 +20,21 @@ function downloadBurn()
/* Add watermark */
var canvas = document.querySelector('#cloneCanvas #burnCanvas');
var cans = canvas.getContext('2d');
canvas.height = 525;
canvas.width = 1050;
// Set background color to white
cans.fillStyle = '#fff';
cans.fillRect(0, 0, canvas.width, canvas.height);
cans.drawImage($('#cloneCanvas #cloneImage').get(0), 0, 0);
cans.drawImage($('#cloneCanvas #cloneImage').get(0), 0, 25);
cans.font = "16px Microsoft JhengHei";
cans.fillStyle = "rgba(17, 17, 17, 0.50)";
cans.textAlign = 'left';
cans.textBaseline = 'Middle';
cans.fillText(watermark, 50, canvas.height - 50);
cans.fillText(burnYUnit, 0, 20)
cans.fillText(burnXUnit, canvas.width - 50, canvas.height - 15);
var type = 'png';
var $canvas = $('#cloneCanvas #burnCanvas');
module/project/lang/zh-cn.php
+2
View File
@@ -71,6 +71,8 @@ $lang->project->readjustTask = '顺延任务的起止时间';
$lang->project->effort = '日志';
$lang->project->relatedMember = '相关成员';
$lang->project->watermark = '由禅道导出';
$lang->project->burnXUnit = '(日期)';
$lang->project->burnYUnit = '(工时)';
$lang->project->viewByUser = '按用户查看';
$lang->project->start = "开始";
module/project/view/burn.html.php
+2
View File
@@ -15,6 +15,8 @@
<?php js::set('projectID', $projectID);?>
<?php js::set('projectName', $project->name);?>
<?php js::set('watermark', $lang->project->watermark);?>
<?php js::set('burnXUnit', $lang->project->burnXUnit);?>
<?php js::set('burnYUnit', $lang->project->burnYUnit);?>
<?php js::set('type', $type);?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
module/story/model.php
+1 -1
View File
@@ -56,7 +56,7 @@ class storyModel extends model
foreach($plans as $planID => $plan)
{
$story->planTitle[$planID] = $plan->title;
if($plan->branch and !isset($story->stages[$plan->branch])) $story->stages[$plan->branch] = 'planned';
if($plan->branch and !isset($story->stages[$plan->branch]) and empty($story->branch)) $story->stages[$plan->branch] = 'planned';
}
}
$extraStories = array();
module/testcase/js/edit.js
-2
View File
@@ -15,8 +15,6 @@ function getList()
$(document).ready(function()
{
$("#story").chosen();
$(document).on('change', '[name^=steps], [name^=expects]', function()
{
var steps = [];
module/testcase/view/edit.html.php
+1 -1
View File
@@ -195,7 +195,7 @@
<?php if(!$isLibCase and $config->global->flow != 'onlyTest'):?>
<tr>
<th><?php echo $lang->testcase->story;?></th>
<td class='text-left'><div id='storyIdBox'><?php echo html::select('story', $stories, $case->story, 'class=form-control chosen');?></div>
<td class='text-left'><div id='storyIdBox'><?php echo html::select('story', $stories, $case->story, 'class="form-control chosen"');?></div>
</td>
</tr>
<?php endif;?>
module/todo/view/batchcreate.html.php
+5 -5
View File
@@ -13,11 +13,6 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<div id='formSettingBtn' class='pull-right btn-toolbar'>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=todo&section=custom&key=batchCreateFields')?>
<?php include '../../common/view/customfield.html.php';?>
<div class="divider" style="margin-right: 30px;"></div>
</div>
<form id='todoBatchAddForm' method='post' target='hiddenwin' action='<?php echo $this->createLink('todo', 'batchCreate');?>'>
<div id="mainContent">
<div class="main-header">
@@ -32,6 +27,11 @@
</div>
</span>
</div>
<div id='formSettingBtn' class='pull-right btn-toolbar'>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=todo&section=custom&key=batchCreateFields')?>
<?php include '../../common/view/customfield.html.php';?>
<div class="divider"></div>
</div>
</div>
<?php
$visibleFields = array();