Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

module/block/view/bugblock.html.php

@@ -30,7 +30,7 @@
         <?php if($longBlock):?>
         <th class='c-level'><?php echo $lang->bug->severityAB?></th>
         <th class='c-pri'><?php echo $lang->priAB?></th>
-        <th class='c-date'><?php echo $lang->bug->openedDate;?></th>
+        <th class='c-date'><?php echo $lang->bug->deadline;?></th>
         <?php endif;?>
         <th class='c-status'><?php echo $lang->bug->statusAB;?></th>
       </tr>
@@ -63,7 +63,7 @@
           <?php endif;?>
         </td>
         <td class='c-pri'><span class='label-pri label-pri-<?php echo $bug->pri?>' title='<?php echo zget($lang->bug->priList, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri)?></span></td>
-        <td class='c-date'><?php echo $bug->openedDate;?></td>
+        <td class='c-date'><?php echo helper::isZeroDate($bug->deadline) ? '' : $bug->deadline;?></td>
         <?php endif;?>
         <?php $status = $this->processStatus('bug', $bug);?>
         <td class='c-status' title='<?php echo $status;?>'>

module/message/model.php

@@ -21,8 +21,8 @@ class messageModel extends model
     }
 
     /**
-     * Get objectTypes 
-     * 
+     * Get objectTypes
+     *
      * @access public
      * @return array
      */
@@ -37,8 +37,8 @@ class messageModel extends model
     }
 
     /**
-     * Get object actions. 
-     * 
+     * Get object actions.
+     *
      * @access public
      * @return array
      */
@@ -57,11 +57,11 @@ class messageModel extends model
 
     /**
      * Check send.
-     * 
-     * @param  string $objectType 
-     * @param  int    $objectID 
-     * @param  string $actionType 
-     * @param  int    $actionID 
+     *
+     * @param  string $objectType
+     * @param  int    $objectID
+     * @param  string $actionType
+     * @param  int    $actionID
      * @access public
      * @return void
      */
@@ -102,11 +102,11 @@ class messageModel extends model
 
     /**
      * Save notice.
-     * 
-     * @param  string $objectType 
-     * @param  int    $objectID 
-     * @param  string $actionType 
-     * @param  int    $actionID 
+     *
+     * @param  string $objectType
+     * @param  int    $objectID
+     * @param  string $actionType
+     * @param  int    $actionID
      * @access public
      * @return void
      */
@@ -127,11 +127,16 @@ class messageModel extends model
         $this->app->loadConfig('mail');
         $sysURL = zget($this->config->mail, 'domain', common::getSysURL());
 
+        $isonlybody = isonlybody();
+        if($isonlybody) unset($_GET['onlybody']);
+
         $moduleName = $objectType == 'case' ? 'testcase' : $objectType;
         $space = common::checkNotCN() ? ' ' : '';
         $data  = $user->realname . $space . $this->lang->action->label->$actionType . $space . $this->lang->action->objectTypes[$objectType];
         $data .= ' ' . html::a($sysURL . helper::createLink($moduleName, 'view', "id=$objectID"), "[#{$objectID}::{$object->$field}]");
 
+        if($isonlybody) $_GET['onlybody'] = 'yes';
+
         $notify = new stdclass();
         $notify->objectType  = 'message';
         $notify->action      = $actionID;
@@ -146,9 +151,9 @@ class messageModel extends model
 
     /**
      * Get toList.
-     * 
-     * @param  object    $object 
-     * @param  string    $objectType 
+     *
+     * @param  object    $object
+     * @param  string    $objectType
      * @access public
      * @return string
      */
@@ -165,7 +170,7 @@ class messageModel extends model
 
     /**
      * Get notice todos.
-     * 
+     *
      * @access public
      * @return array
      */

module/story/control.php

@@ -1577,7 +1577,7 @@ class story extends control
         if($result == 'no')
         {
             $this->dao->update(TABLE_STORY)->set('URChanged')->eq(0)->where('id')->eq($storyID)->exec();
-            die(js::closeModal('parent.parent', 'this'));
+            die(js::reload('parent', 'this'));
         }
 
         $this->view->changedStories = $this->story->getChangedStories($story);