Merge branch 'liyuchun_fixbug' into 'zenops_44'

Liyuchun fixbug

See merge request easycorp/zentaopms!5242

module/repo/control.php

@@ -302,6 +302,7 @@ class repo extends control
         $this->view->file         = $file;
         $this->view->entry        = $entry;
         $this->view->path         = $entry;
+        $this->view->info         = $info;
         $this->view->suffix       = $suffix;
         $this->view->content      = $content ? $content : '';
         $this->view->pathInfo     = $pathInfo;

module/repo/css/ajaxgetrelationinfo.css

@@ -1,6 +1,7 @@
 body {background-color: #fff; padding-bottom: 20px;}
 .linkContent .panel {margin-bottom: 0; padding-bottom: 10px; border: none;}
-.left-content {border-right: 1px solid #EDEEF2; padding-top: 15px;}
+.left-content {padding-top: 15px;}
+.right-content {border-left: 1px solid #EDEEF2; padding-top: 15px;}
 .text {width: 85%; white-space: normal; word-wrap: break-word; word-break: break-all; font-weight: normal; padding-left: 10px;}
 .cell {min-height: 300px;}
 .menu-title {width: 100%;}

module/repo/view/ajaxgetrelationinfo.html.php

@@ -41,7 +41,11 @@ include '../../common/view/header.lite.html.php';
 <script>
 $(function()
 {
-    $('a').attr('href', 'javascript:;').removeClass('iframe').css('color', '#3c4353');
+    $('a').each(function()
+    {
+        var content = $(this).html();
+        $(this).replaceWith(content);
+    })
     $('blockquote a').empty();
 });
 </script>

module/task/model.php

@@ -1745,8 +1745,10 @@ class taskModel extends model
         foreach($record->dates    as $id => $item) if($item > $today) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->date;
         if(dao::isError()) return false;
 
+        $task = $this->getById($taskID);
+        if(!empty($task->team) and !isset($task->team[$this->app->user->account])) return false;
+
         $estimates    = array();
-        $task         = $this->getById($taskID);
         $earliestTime = '';
         foreach(array_keys($record->id) as $id)
         {