Merge branch 'master' into 'master_xieqiyu_67691'

# Conflicts:
#   db/update17.6.sql

module/task/view/lineareffort.html.php

@@ -48,6 +48,7 @@ foreach($efforts as $effort)
           </thead>
           <tbody>
             <?php foreach($allEfforts[$order] as $effort):?>
+            <?php if($effort->account != $this->app->user->account) continue;?>
             <tr class="text-center">
               <td><?php echo $effort->date;?></td>
               <td><?php echo zget($users, $effort->account);?></td>

module/task/view/recordestimate.html.php

@@ -74,10 +74,10 @@
     <div class="alert with-icon">
       <i class="icon-exclamation-sign"></i>
       <div class="content">
-        <?php if($task->assignedTo != $app->user->account and $task->mode == 'linear'):?>
-        <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->logEfforts);?></p>
-        <?php elseif(!isset($task->members[$app->user->account])):?>
+        <?php if(!isset($task->members[$app->user->account])):?>
         <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $lang->task->teamMember . '</strong>', $lang->task->logEfforts);?></p>
+        <?php elseif($task->assignedTo != $app->user->account and $task->mode == 'linear'):?>
+        <p><?php echo sprintf($lang->task->deniedNotice, '<strong>' . $task->assignedToRealName . '</strong>', $lang->task->logEfforts);?></p>
         <?php endif;?>
       </div>
     </div>