Merge branch 'master' of github.com:easysoft/zentaopms

module/mail/lang/zh-cn.php

@@ -68,6 +68,7 @@ $lang->mail->secureList['']    = '不加密';
 $lang->mail->secureList['ssl'] = 'ssl';
 $lang->mail->secureList['tls'] = 'tls';
 
+$lang->mail->more           = '更多...';
 $lang->mail->inputFromEmail = '请输入发信邮箱：';
 $lang->mail->nextStep       = '下一步';
 $lang->mail->successSaved   = '配置信息已经成功保存。';

module/mail/model.php

@@ -568,10 +568,20 @@ class mailModel extends model
         $firstMail = array_shift($mails);
         $lastMail  = array_pop($mails);
 
-        $mail->id       = $firstMail->id;
-        $mail->toList   = $firstMail->toList;
-        $mail->ccList   = $firstMail->ccList;
-        $mail->subject  = $firstMail->subject;
+        /* Set mail info.*/
+        $mail->id      = $firstMail->id;
+        $mail->toList  = $firstMail->toList;
+        $mail->ccList  = $firstMail->ccList;
+        $mail->subject = $firstMail->subject;
+        if($mails)
+        {
+            $secondMail = reset($mails);
+            $mail->subject .= '|' . $secondMail->subject . '|' . $this->lang->mail->more;
+        }
+        else
+        {
+            $mail->subject .= '|' . $lastMail->subject;
+        }
 
         /* Remove html tail for first mail. */
         $endPos     = strripos($firstMail->body, '</td>');
@@ -582,8 +592,7 @@ class mailModel extends model
         {
             foreach($mails as $middleMail)
             {
-                $mail->id      .= ',' . $middleMail->id;
-                $mail->subject .= '|' . $middleMail->subject;
+                $mail->id .= ',' . $middleMail->id;
 
                 /* Remove html head and tail for middle mails. */
                 $beginPos = strpos($middleMail->body, '</table>');
@@ -595,12 +604,11 @@ class mailModel extends model
             }
         }
 
-        $mail->id      .= ',' . $lastMail->id;
-        $mail->subject .= '|' . $lastMail->subject;
+        $mail->id .= ',' . $lastMail->id;
 
         /* Remove html head for last mail. */
-        $beginPos   = strpos($lastMail->body, '</table>');
-        $mailBody   = substr($lastMail->body, $beginPos);
+        $beginPos    = strpos($lastMail->body, '</table>');
+        $mailBody    = substr($lastMail->body, $beginPos);
         $mail->body .= trim(ltrim($mailBody, '</table>'));
 
         return $mail;

module/productplan/view/view.html.php

@@ -17,6 +17,8 @@
   <div class='heading'>
   <span class='prefix'><?php echo html::icon($lang->icons['plan']);?> <strong><?php echo $plan->id;?></strong></span>
     <strong><?php echo $plan->title;?></strong>
+    <?php if($product->type !== 'normal') echo "<span title='{$lang->product->branchName[$product->type]}' class='label label-branch label-badge'>" . $branches[$branch] . '</span>';?>
+    <span class='label label-info label-badge'><?php echo $plan->begin . '~' . $plan->end;?></span>
     <?php if($plan->deleted):?>
     <span class='label label-danger'><?php echo $lang->plan->deleted;?></span>
     <?php endif; ?>

module/project/control.php

@@ -386,8 +386,7 @@ class project extends control
             $this->loadModel('task');
             foreach($mails as $mail) $this->task->sendmail($mail->taskID, $mail->actionID);
 
-            /* Locate the browser. */
-            die(js::locate($this->createLink('project', 'task', "projectID=$projectID"), 'parent'));
+            die(js::locate($this->createLink('project', 'importBug', "projectID=$projectID"), 'parent'));
         }
 
         /* Set browseType, productID, moduleID and queryID. */