diff --git a/module/mail/config.php b/module/mail/config.php index f30b6c718d..d4d1296aa4 100644 --- a/module/mail/config.php +++ b/module/mail/config.php @@ -2,7 +2,7 @@ $config->mail->turnon = false; // trun on email feature or not. $config->mail->fromAddress = ''; // The from address. $config->mail->fromName = ''; // The from name. -$config->mail->mta = 'gmail'; // phpmail|sendmail|smtp|gmail +$config->mail->mta = 'smtp'; // phpmail|sendmail|smtp|gmail /* SMTP settings. */ if($config->mail->mta == 'smtp') diff --git a/module/mail/view/set.html.php b/module/mail/view/set.html.php index 66440ec5b4..231263eabc 100755 --- a/module/mail/view/set.html.php +++ b/module/mail/view/set.html.php @@ -12,6 +12,7 @@ include '../../common/view/header.html.php'; include '../../common/view/tablesorter.html.php';?> mta)) $mta = $mailConfig->mta; if(!empty($mailConfig->gmail->username)) $gmailUsername = $mailConfig->gmail->username; if(!empty($mailConfig->gmail->password)) $gmailPassword = $mailConfig->gmail->password; if(!empty($mailConfig->smtp->username)) $smtpUsername = $mailConfig->smtp->username; @@ -38,7 +40,7 @@ if(!empty($mailConfig->smtp->port)) $smtpPort = $mailConfig->smtp->por mail->mta; ?> - mail->mtaList, $mailConfig->mta, 'class=select-3 onchange=setMtaType(this.value)'); ?> + mail->mtaList, $mta, 'class=select-3 onchange=setMtaType(this.value)'); ?> mail->fromAddress; ?> diff --git a/module/story/lang/en.php b/module/story/lang/en.php index fca7eb2611..1182fb8125 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -70,7 +70,6 @@ $lang->story->reviewResult = 'Reviewed result'; $lang->story->preVersion = 'Pre version'; $lang->story->keywords = 'Keyword'; -$lang->story->use = 'Use or not'; $lang->story->same = 'The same up'; $lang->story->useList[0] = 'No use'; @@ -151,7 +150,7 @@ $lang->story->affectedBugs = 'Affected bugs'; $lang->story->affectedCases = 'Affected cases'; $lang->story->specTemplate = "Recommend template::As <a type of user>,I want <some goals>,so that <some reason>."; -$lang->story->needReview = 'Need review'; +$lang->story->notes = "(notes:if the title is empty, it is no use)"; $lang->story->needNotReview = "needn't review"; $lang->story->confirmDelete = "Are you sure to delete this story?"; $lang->story->errorFormat = 'Error format'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 3c6aa1b930..5a854bdf6c 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -70,7 +70,6 @@ $lang->story->reviewResult = '评审结果'; $lang->story->preVersion = '之前版本'; $lang->story->keywords = '关键词'; -$lang->story->use = '是否使用'; $lang->story->same = '同上'; $lang->story->useList[0] = '不使用'; @@ -151,7 +150,7 @@ $lang->story->affectedBugs = '影响的Bug'; $lang->story->affectedCases = '影响的用例'; $lang->story->specTemplate = "建议参考的模板:作为一名<某种类型的用户>,我希望<达成某些目的>,这样可以<开发的价值>。"; -$lang->story->needReview = '是否需要评审'; +$lang->story->notes = '(注:如果“需求标题”为空,则表示不使用此行)'; $lang->story->needNotReview = '不需要评审'; $lang->story->confirmDelete = "您确认删除该需求吗?"; $lang->story->errorFormat = '需求数据有误'; diff --git a/module/story/model.php b/module/story/model.php index 432f040b5b..42aa3dfbce 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -143,11 +143,11 @@ class storyModel extends model $stories = fixer::input('post')->get(); for($i = 0; $i < $this->config->story->batchCreate; $i++) { - if($stories->use[$i] == 1) + if($stories->title[$i] != '') { $data[$i]->module = $stories->module[$i] != 'same' ? $stories->module[$i] : ($i == 0 ? 0 : $data[$i-1]->module); $data[$i]->plan = $stories->plan[$i] == 'same' ? ($i != 0 ? $data[$i-1]->plan : 0) : ($stories->plan[$i] != '' ? $stories->plan[$i] : 0); - $data[$i]->title = $stories->title[$i] != '' ? $stories->title[$i] : ''; + $data[$i]->title = $stories->title[$i]; $data[$i]->pri = $stories->pri[$i] != '' ? $stories->pri[$i] : 0; $data[$i]->estimate = $stories->estimate[$i] != '' ? $stories->estimate[$i] : 0; $data[$i]->status = $stories->needReview[$i] == 0 ? 'active' : 'draft'; diff --git a/module/story/view/batchcreate.html.php b/module/story/view/batchcreate.html.php index 1dfc66ba5a..c133ca32d0 100644 --- a/module/story/view/batchcreate.html.php +++ b/module/story/view/batchcreate.html.php @@ -13,9 +13,8 @@
- + - @@ -28,14 +27,13 @@ - - + + - +
story->product; echo $lang->story->batchCreate;?>story->product . $lang->colon . $lang->story->batchCreate; echo "{$lang->story->notes}";?>
story->use;?> story->module;?> story->plan;?> story->title;?>
story->useList, 0);?> - *";?> story->priList, $pri, 'class=w-50px');?> story->reviewList, 0, "id='needNotReview'");?>story->reviewList, 0, '');?>