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

db/update11.3.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `zt_case` ADD `fromCaseVersion` mediumint(8) unsigned NOT NULL AFTER `fromCaseID`;
+ALTER TABLE `zt_case` ADD `ignoreCaseVersion` mediumint(8) unsigned NOT NULL AFTER `fromCaseVersion`;

module/block/view/dashboard.html.php

@@ -44,13 +44,13 @@ $useGuest = $this->app->user->account == 'guest';
             <li class='dropdown'>
               <a href='javascript:;' data-toggle='dropdown' class='panel-action'><i class='icon icon-ellipsis-v'></i></a>
               <ul class='dropdown-menu pull-right'>
-                <li><a href='javascript:;' class='refresh-panel'><i class='icon-repeat'></i> <?php echo $lang->block->refresh ?></a></li>
+                <li><a href='javascript:;' class='refresh-panel'><i class='icon-repeat'></i> <?php echo $lang->block->refresh . $lang->block->common;?></a></li>
                 <?php if(!$useGuest):?>
-                <li><a data-toggle='modal' href="<?php echo $this->createLink("block", "admin", "id=$block->id&module=$module");?>" class='edit-block' data-title='<?php echo $block->title;?>' ><?php echo $lang->edit;?></a></li>
+                <li><a data-toggle='modal' href="<?php echo $this->createLink("block", "admin", "id=$block->id&module=$module");?>" class='edit-block' data-title='<?php echo $block->title;?>' ><?php echo $lang->edit . $lang->block->common;?></a></li>
                 <?php if(!$block->source and $block->block == 'html'):?>
-                <li><a href="javascript:hiddenBlock(<?php echo $index;?>)" class="hidden-panel"><?php echo $lang->block->hidden;?></a></li>
+                <li><a href="javascript:hiddenBlock(<?php echo $index;?>)" class="hidden-panel"><?php echo $lang->block->hidden . $lang->block->common ;?></a></li>
                 <?php endif;?>
-                <li><a href='javascript:deleteBlock(<?php echo $index;?>);' class='remove-panel'><?php echo $lang->block->remove;?></a></li>
+                <li><a href='javascript:deleteBlock(<?php echo $index;?>);' class='remove-panel'><?php echo $lang->block->remove . $lang->block->common;?></a></li>
                 <?php endif;?>
                 <li><?php echo html::a($this->createLink("block", "admin", "id=0&module=$module"), "{$lang->block->createBlock}", '', "data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}'")?></li>
                 <li><?php echo html::a($this->createLink("block", "ajaxReset", "module=$module"), "{$lang->block->reset}", 'hiddenwin')?></li>
@@ -82,13 +82,13 @@ $useGuest = $this->app->user->account == 'guest';
             <li class='dropdown'>
               <a href='javascript:;' data-toggle='dropdown' class='panel-action'><i class='icon icon-ellipsis-v'></i></a>
               <ul class='dropdown-menu pull-right'>
-                <li><a href='javascript:;' class='refresh-panel'><i class='icon-repeat'></i> <?php echo $lang->block->refresh ?></a></li>
+                <li><a href='javascript:;' class='refresh-panel'><i class='icon-repeat'></i> <?php echo $lang->block->refresh . $lang->block->common ?></a></li>
                 <?php if(!$useGuest):?>
-                <li><a data-toggle='modal' href="<?php echo $this->createLink("block", "admin", "id=$block->id&module=$module"); ?>" class='edit-block' data-title='<?php echo $block->title; ?>' ><?php echo $lang->edit; ?></a></li>
+                <li><a data-toggle='modal' href="<?php echo $this->createLink("block", "admin", "id=$block->id&module=$module"); ?>" class='edit-block' data-title='<?php echo $block->title; ?>' ><?php echo $lang->edit . $lang->block->common; ?></a></li>
                 <?php if(!$block->source and $block->block == 'html'):?>
-                <li><a href="javascript:hiddenBlock(<?php echo $index;?>)" class="hidden-panel"><?php echo $lang->block->hidden; ?></a></li>
+                <li><a href="javascript:hiddenBlock(<?php echo $index;?>)" class="hidden-panel"><?php echo $lang->block->hidden  . $lang->blcok->common; ?></a></li>
                 <?php endif;?>
-                <li><a href='javascript:deleteBlock(<?php echo $index?>);' class='remove-panel'><?php echo $lang->block->remove; ?></a></li>
+                <li><a href='javascript:deleteBlock(<?php echo $index?>);' class='remove-panel'><?php echo $lang->block->remove . $lang->block->common; ?></a></li>
                 <?php endif;?>
                 <li><?php echo html::a($this->createLink("block", "admin", "id=0&module=$module"), "{$lang->block->createBlock}", '', "data-toggle='modal' data-type='ajax' data-width='700' data-title='{$lang->block->createBlock}'")?></li>
                 <li><?php echo html::a($this->createLink("block", "ajaxReset", "module=$module"), "{$lang->block->reset}", 'hiddenwin')?></li>

module/company/view/browse.html.php

@@ -73,7 +73,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           <th class="c-url"><?php common::printOrderLink('email', $orderBy, $vars, $lang->user->email);?></th>
           <th class="c-type"><?php common::printOrderLink('gender', $orderBy, $vars, $lang->user->gender);?></th>
           <th><?php common::printOrderLink('phone', $orderBy, $vars, $lang->user->phone);?></th>
-          <th><?php $this->app->getClientLang() == 'en' ? common::printOrderLink('skype', $orderBy, $vars, $lang->user->skype) : common::printOrderLink('qq', $orderBy, $vars, $lang->user->qq);?></th>
+          <th><?php (isset($this->config->isINT) and $this->config->isINT) ? common::printOrderLink('skype', $orderBy, $vars, $lang->user->skype) : common::printOrderLink('qq', $orderBy, $vars, $lang->user->qq);?></th>
           <th class="c-date"><?php common::printOrderLink('last', $orderBy, $vars, $lang->user->last);?></th>
           <th class="w-90px"><?php common::printOrderLink('visits', $orderBy, $vars, $lang->user->visits);?></th>
           <th class='c-actions'><?php echo $lang->actions;?></th>
@@ -95,7 +95,7 @@ js::set('confirmDelete', $lang->user->confirmDelete);
           <td class="c-url" title="<?php echo $user->email;?>"><?php echo html::mailto($user->email);?></td>
           <td class="c-type"><?php echo zget($lang->user->genderList, $user->gender, $user->gender);?></td>
           <td><?php echo $user->phone;?></td>
-          <td><?php echo $this->app->getClientLang() == 'en' ? $user->skype : ($user->qq ? html::a("tencent://message/?uin=$user->qq", $user->qq) : '');?></td>
+          <td><?php echo (isset($this->config->isINT) and $this->config->isINT) ? $user->skype : ($user->qq ? html::a("tencent://message/?uin=$user->qq", $user->qq) : '');?></td>
           <td class='c-date'><?php if($user->last) echo date('Y-m-d', $user->last);?></td>
           <td class='c-num text-center'><?php echo $user->visits;?></td>
           <td class='c-actions'>

module/file/control.php

@@ -196,7 +196,7 @@ class file extends control
         }
         else
         {
-            $this->app->triggerError("The file you visit $fileID not found.", __FILE__, __LINE__, true);
+            die($this->lang->file->fileNotFound);
         }
     }
 

module/file/lang/en.php

@@ -56,3 +56,4 @@ $lang->file->dangerFile          = " File has been rejected to upload for securi
 $lang->file->errorSuffix         = 'Format is incorrect. .zip files ONLY!';
 $lang->file->errorExtract        = 'Extracting file failed. File might be damaged or invalid files in the zip package.';
 $lang->file->uploadImagesExplain = 'Note: upload .jpg, .jpeg, .gif, and .png images. The image name will be taken as the title of the story and the image as its content.';
+$lang->file->fileNotFound        = 'The file was not found, maybe the physical file has been deleted!';

module/file/lang/zh-cn.php

@@ -56,3 +56,4 @@ $lang->file->dangerFile          = " 您选择的文件存在安全风险，系
 $lang->file->errorSuffix         = '压缩包格式错误，只能上传zip压缩包！';
 $lang->file->errorExtract        = '解压缩失败！可能文件已经损坏，或压缩包里含有非法上传文件。';
 $lang->file->uploadImagesExplain = '注：请上传"jpg, jpeg, gif, png"格式的图片，程序会以文件名作为标题，以图片作为内容。';
+$lang->file->fileNotFound        = '未找到该文件，可能物理文件已被删除！';

module/product/css/view.css

@@ -4,3 +4,4 @@
 .block-release .panel-body, .block-dynamic .panel-body {height: 240px; overflow-x: hidden; overflow-y: auto; position: relative;}
 .block-release .panel-body {padding-bottom: 50px;}
 .block-release .panel-body > .btn.pull-right {position: absolute; right: 20px; bottom: 20px;}
+.col-4 .cell table td{word-wrap: break-word; word-break: normal;}

module/project/css/task.css

@@ -1 +1,2 @@
 td.delayed{background: #e84e0f!important; color: white;}
+#int-dropdown{margin-left: -8px; border-radius: 4px; border: 1px solid #0c64eb}

module/project/view/burn.html.php

@@ -25,7 +25,7 @@
     echo $lang->project->howToUpdateBurn;
     ?>
     <?php if($interval):?>
-    <div class='input-control w-120px'>
+    <div class='input-control <?php echo $this->app->getClientLang() == 'en' ? "w-150px" : "w-120px" ?>'>
       <?php echo html::select('interval', $dayList, $interval, "class='form-control chosen'");?>
     </div>
     <?php endif;?>

module/project/view/task.html.php

@@ -149,12 +149,24 @@ js::set('browseType', $browseType);
     <?php
     $checkObject = new stdclass();
     $checkObject->project = $projectID;
-    $link = $this->createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
-    if(common::hasPriv('task', 'batchCreate', $checkObject)) echo html::a($link, "<i class='icon icon-plus'></i> {$lang->task->batchCreate}", '', "class='btn btn btn-secondary'");
+    if(!isset($this->config->isINT) or !$this->config->isINT or $this->app->getClientLang() != 'en')
+    {
+        $link = $this->createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
+        if(common::hasPriv('task', 'batchCreate', $checkObject)) echo html::a($link, "<i class='icon icon-plus'></i> {$lang->task->batchCreate}", '', "class='btn btn btn-secondary'");
+    }
 
     $link = $this->createLink('task', 'create', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));
     if(common::hasPriv('task', 'create', $checkObject)) echo html::a($link, "<i class='icon icon-plus'></i> {$lang->task->create}", '', "class='btn btn-primary'");
     ?>
+    <?php if(isset($this->config->isINT) and $this->config->isINT and $this->app->getClientLang() == 'en'):?>
+    <?php $link = $this->createLink('task', 'batchCreate', "project=$projectID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : ''));?>
+    <div class="btn-group dropdown-hover">
+      <button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown' id='int-dropdown'> <span class='caret'></span> </button>
+      <ul class="dropdown-menu pull-right">
+      <?php echo "<li>" . html::a($link, "<i class='icon icon-plus'></i>" . $lang->task->batchCreate) . "</li>";?>
+      </ul>
+    </div>
+    <?php endif;?>
   </div>
 </div>
 <div id="mainContent" class="main-row fade">

module/task/lang/en.php

@@ -106,7 +106,6 @@ $lang->task->team              = 'Team';
 $lang->task->transfer          = 'Transfer';
 $lang->task->transferTo        = 'Transfer To';
 $lang->task->children          = 'Child Task';
-$lang->task->unlinkParent      = 'Unlink Parent';
 $lang->task->childrenAB        = 'Child';
 $lang->task->parent            = 'Parent Task';
 $lang->task->parentAB          = 'Parent Task';

module/task/lang/zh-cn.php

@@ -106,7 +106,6 @@ $lang->task->team             = '团队';
 $lang->task->transfer         = '转交';
 $lang->task->transferTo       = '转交给';
 $lang->task->children         = '子任务';
-$lang->task->unlinkParent     = '取消子任务';
 $lang->task->childrenAB       = '子';
 $lang->task->parent           = '父任务';
 $lang->task->parentAB         = '父';

module/task/model.php

@@ -655,13 +655,13 @@ class taskModel extends model
             ->setIF($this->post->assignedTo != $oldTask->assignedTo, 'assignedDate', $now)
 
             ->setIF($this->post->status == 'wait' and $this->post->left == $oldTask->left and $this->post->consumed == 0 and $this->post->estimate, 'left', $this->post->estimate)
-            ->setIF(isset($_POST['unlinkParent']), 'parent', 0)
+            ->setIF($oldTask->parent > 0 and !$this->post->parent, 'parent', 0)
 
             ->setDefault('lastEditedBy',   $this->app->user->account)
             ->add('lastEditedDate', $now)
             ->stripTags($this->config->task->editor->edit['id'], $this->config->allowedTags)
             ->join('mailto', ',')
-            ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu,unlinkParent')
+            ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,contactListMenu')
             ->get();
 
         if($task->consumed < $oldTask->consumed) die(js::error($this->lang->task->error->consumedSmall));

module/task/view/edit.html.php

@@ -103,18 +103,12 @@
                 <td><span id="storyIdBox"><?php echo html::select('story', $stories, $task->story, "class='form-control chosen'");?></span></td>
               </tr>
               <?php endif;?>
-              <?php if($task->parent == 0 and empty($task->team)):?>
+              <?php if($task->parent >= 0 and empty($task->team)):?>
               <tr>
                 <th><?php echo $lang->task->parent;?></th>
                 <td><?php echo html::select('parent', $tasks, $task->parent, "class='form-control chosen'");?></td>
               </tr>
               <?php endif;?>
-              <?php if($task->parent > 0):?>
-              <tr>
-                <th><?php echo $lang->task->unlinkParent;?></th>
-                <td><?php echo html::checkbox('unlinkParent', '');?></td>
-              </tr>
-              <?php endif;?>
               <tr>
                 <th><?php echo $lang->task->assignedTo;?></th>
                 <td><span id="assignedToIdBox"><?php echo html::select('assignedTo', $members, $task->assignedTo, "class='form-control chosen'");?></span></td>

module/task/view/view.html.php

@@ -247,7 +247,7 @@
                 </tr>
                 <?php endif;?>
                 <tr>
-                  <th><?php echo empty($task->team) ? $lang->task->assignTo : $lang->task->transferTo;?></th>
+                  <th><?php echo $lang->task->assignedTo;?></th>
                   <td><?php echo $task->assignedTo ? $task->assignedToRealName . $lang->at . $task->assignedDate : $lang->noData;?></td>
                 </tr>
                 <tr>