Merge branch 'liyuchun_fixbug' into 'master'

* Fix bug #13324.

See merge request easycorp/zentaopms!2684

module/misc/lang/en.php

@@ -28,27 +28,18 @@ $lang->misc->zentao->icons['service'] = 'heart';
 
 $lang->misc->zentao->about['bizversion']   = 'ZenTao Biz';
 $lang->misc->zentao->about['official']     = "Official Website";
-$lang->misc->zentao->about['changelog']    = "Change Log";
 $lang->misc->zentao->about['license']      = "License";
 
-
-
 $lang->misc->zentao->support['vip']        = "VIP Support";
 $lang->misc->zentao->support['manual']     = "User Manual";
 
-
-
-
-
 $lang->misc->zentao->cowin['reportbug']    = "Report Bug ";
 $lang->misc->zentao->cowin['feedback']     = "Feedback";
 $lang->misc->zentao->cowin['translate']    = "Translate";
 $lang->misc->zentao->cowin['recommend']    = "More";
 
-
 $lang->misc->zentao->service['idc']        = 'ZenTao Cloud';
 $lang->misc->zentao->service['custom']     = 'ZenTao Custom';
-$lang->misc->zentao->service['servicemore']= 'More';
 
 global $config;
 $lang->misc->zentao->others['chanzhi']  = "<img src='{$config->webRoot}theme/default/images/main/chanzhi.ico' /> Zsite";

module/misc/lang/zh-cn.php

@@ -42,13 +42,11 @@ $lang->misc->zentao->support['qqgroup']    = "官方QQ群";
 
 $lang->misc->zentao->cowin['reportbug']    = "汇报Bug";
 $lang->misc->zentao->cowin['feedback']     = "反馈需求";
-$lang->misc->zentao->cowin['translate']    = "参与翻译";
 $lang->misc->zentao->cowin['recommend']    = "推荐给朋友";
 
 $lang->misc->zentao->service['zentaotrain']= '禅道使用培训';
 $lang->misc->zentao->service['idc']        = '禅道在线托管';
 $lang->misc->zentao->service['custom']     = '禅道定制开发';
-$lang->misc->zentao->service['servicemore']= '更多服务...';
 
 global $config;
 $lang->misc->zentao->others['chanzhi']  = "<img src='{$config->webRoot}theme/default/images/main/chanzhi.ico' /> 蝉知门户";

module/my/control.php

@@ -922,8 +922,7 @@ EOF;
         $sort = common::appendOrder($orderBy);
 
         /* Get users by dept. */
-        $user   = $this->loadModel('user')->getById($this->app->user->account, 'account');
-        $deptID = $user->dept;
+        $deptID = $this->app->user->admin ? 0 : $this->app->user->dept;
         $users  = $this->loadModel('company')->getUsers('inside', 'bydept', 0, $deptID, $sort, $pager);
         foreach($users as $user) unset($user->password); // Remove passwd.
 

module/todo/control.php

@@ -376,6 +376,12 @@ class todo extends control
             if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => '404 Not found'));
             return print(js::error($this->lang->notFound) . js::locate('back'));
         }
+
+        if($todo->private and $todo->account != $this->app->user->account)
+        {
+            return print(js::error($this->lang->todo->thisIsPrivate) . js::locate('back'));
+        }
+
         /* Save the session. */
         if(!isonlybody())
         {

module/todo/view/view.html.php

@@ -13,7 +13,6 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('systemMode', $config->systemMode);?>
-<?php if(!$todo->private or ($todo->private and $todo->account == $app->user->account)):?>
 <style>.chosen-container .chosen-results{max-height: 170px; overflow-y: initial;}</style>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
@@ -302,9 +301,6 @@
 </div>
 <?php js::set('todoID', $todo->id);?>
 <?php js::set('selectExecution', $lang->execution->selectExecution);?>
-<?php else:?>
-<?php echo $lang->todo->thisIsPrivate;?>
-<?php endif;?>
 <script>
 $(function() {parent.$('body.hide-modal-close').removeClass('hide-modal-close'); })
 </script>

module/user/view/todo.html.php

@@ -52,7 +52,9 @@
         <td><?php echo $todo->date == '2030-01-01' ? $lang->todo->periods['future'] : $todo->date;?></td>
         <td><?php echo $lang->todo->typeList[$todo->type];?></td>
         <td><span class='<?php echo 'pri' . zget($lang->todo->priList, $todo->pri, $todo->pri);?>'><?php echo zget($lang->todo->priList, $todo->pri, $todo->pri);?></span></td>
-        <td class='text-left'><?php echo html::a($this->createLink('todo', 'view', "id=$todo->id&from=company", '', true), $todo->name, '', "class='iframe'");?></td>
+        <td class='text-left'>
+          <?php echo ($todo->private and $this->app->user->account != $todo->account) ? $todo->name : html::a($this->createLink('todo', 'view', "id=$todo->id&from=company", '', true), $todo->name, '', "class='iframe'");?>
+        </td>
         <td><?php echo $todo->begin;?></td>
         <td><?php echo $todo->end;?></td>
         <td class='<?php echo $todo->status;?>'><?php echo $lang->todo->statusList[$todo->status];?></td>