status) !== false ? true : false;?>
- fetch('file', 'printFiles', array('files' => $files, 'fieldset' => 'false', 'object' => $story, 'method' => 'edit', 'showDelete' => $canChangeFile));?>
+ fetch('file', 'printFiles', array('files' => $story->files, 'fieldset' => 'false', 'object' => $story, 'method' => 'edit', 'showDelete' => $canChangeFile));?>
fetch('file', 'buildform') : '';?>
diff --git a/extension/lite/story/ext/view/view.html.php b/extension/lite/story/ext/view/view.html.php
index c002b4c445..fb971c4d9f 100644
--- a/extension/lite/story/ext/view/view.html.php
+++ b/extension/lite/story/ext/view/view.html.php
@@ -69,7 +69,7 @@
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 9504a43007..37b837caa2 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -73,7 +73,7 @@
?>
- fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true', 'object' => $bug));?>
+ fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true', 'object' => $bug, 'method' => 'view', 'showDelete' => false));?>
createLink('action', 'comment', "objectType=bug&objectID=$bug->id");
diff --git a/module/common/lang/de.php b/module/common/lang/de.php
index 3de060ef37..91ed8d50d1 100644
--- a/module/common/lang/de.php
+++ b/module/common/lang/de.php
@@ -100,7 +100,6 @@ $lang->saveSuccess = 'Gespeichert';
$lang->importSuccess = 'Gespeichert';
$lang->fail = 'Fehlgeschlagen';
$lang->addFiles = 'Hinzufügen ';
-$lang->deleteFiles = 'Anhang gelöscht ';
$lang->files = 'Datei ';
$lang->pasteText = 'Einfügen';
$lang->uploadImages = 'Hochladen';
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index c4bba1c349..4dac83fa31 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -100,7 +100,6 @@ $lang->saveSuccess = 'Saved';
$lang->importSuccess = 'Saved';
$lang->fail = 'Fail';
$lang->addFiles = 'Added Files ';
-$lang->deleteFiles = 'Deleted Files ';
$lang->files = 'Files ';
$lang->pasteText = 'Multi-line Paste';
$lang->uploadImages = 'Multi-image Upload';
diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php
index aec37d0a92..67caf6b5fd 100644
--- a/module/common/lang/fr.php
+++ b/module/common/lang/fr.php
@@ -100,7 +100,6 @@ $lang->saveSuccess = 'Sauvegardé';
$lang->importSuccess = 'Sauvé';
$lang->fail = 'Echec';
$lang->addFiles = 'Fichiers ajoutés ';
-$lang->deleteFiles = 'Pièce jointe supprimée ';
$lang->files = 'Fichiers ';
$lang->pasteText = 'Collage Multi-lignes';
$lang->uploadImages = 'Upload Multi-images';
diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php
index 0113ca2d00..dd4c0ef845 100644
--- a/module/common/lang/vi.php
+++ b/module/common/lang/vi.php
@@ -79,7 +79,6 @@ $lang->saveSuccess = 'Đã lưu';
$lang->importSuccess = 'Đã lưu';
$lang->fail = 'Thất bại';
$lang->addFiles = 'Tập tin đã thêm ';
-$lang->deleteFiles = 'Tháo ảnh ';
$lang->files = 'Files ';
$lang->pasteText = 'Dán nhiều dòng';
$lang->uploadImages = 'Tải lên nhiều ảnh';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 8080576b61..a27488d59e 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -100,7 +100,6 @@ $lang->saveSuccess = '保存成功';
$lang->importSuccess = '导入成功';
$lang->fail = '失败';
$lang->addFiles = '上传了附件 ';
-$lang->deleteFiles = '删除了附件 ';
$lang->files = '附件 ';
$lang->pasteText = '多项录入';
$lang->uploadImages = '多图上传 ';
diff --git a/module/file/model.php b/module/file/model.php
index d664584737..accec7aa25 100755
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -46,25 +46,23 @@ class fileModel extends model
->where('objectType')->eq($objectType)
->andWhere('objectID')->eq((int)$objectID)
->andWhere('extra')->ne('editor')
- ->beginIF(strpos('story,requirement', $objectType) !== false and $extra)->andWhere('extra')->like("%,$extra,%")->fi()
- ->beginIF(strpos('story,requirement', $objectType) === false and $extra)->andWhere('extra')->eq($extra)->fi()
+ ->beginIF($extra)->andWhere('extra')->eq($extra)
->andWhere('deleted')->eq('0')
->orderBy('id')
->fetchAll('id');
foreach($files as $file)
{
- if($objectType != 'traincourse' and $objectType != 'traincontents')
- {
- $realPathName = $this->getRealPathName($file->pathname);
- $file->realPath = $this->savePath . $realPathName;
- $file->webPath = $this->webPath . $realPathName;
- }
- else
+ if($objectType == 'traincourse' or $objectType == 'traincontents')
{
$file->realPath = $this->app->getWwwRoot() . 'data/course/' . $file->pathname;
$file->webPath = 'data/course/' . $file->pathname;
+ continue;
}
+
+ $realPathName = $this->getRealPathName($file->pathname);
+ $file->realPath = $this->savePath . $realPathName;
+ $file->webPath = $this->webPath . $realPathName;
}
return $files;
@@ -81,33 +79,52 @@ class fileModel extends model
{
$file = $this->dao->findById($fileID)->from(TABLE_FILE)->fetch();
if(empty($file)) return false;
- if($file->objectType != 'traincourse' and $file->objectType != 'traincontents')
- {
- $realPathName = $this->getRealPathName($file->pathname);
- $file->realPath = $this->savePath . $realPathName;
- $file->webPath = $this->webPath . $realPathName;
- }
- else
- {
- $file->realPath = $this->app->getWwwRoot() . 'data/course/' . $file->pathname;
- $file->webPath = $this->app->getWebRoot() . 'data/course/' . $file->pathname;
- }
- if($file->objectType != 'traincourse' and $file->objectType != 'traincontents')
- {
- $realPathName = $this->getRealPathName($file->pathname);
- $file->realPath = $this->savePath . $realPathName;
- $file->webPath = $this->webPath . $realPathName;
- }
- else
+ if($file->objectType == 'traincourse' or $file->objectType == 'traincontents')
{
$file->realPath = $this->app->getWwwRoot() . 'data/course/' . $file->pathname;
$file->webPath = 'data/course/' . $file->pathname;
+
+ return $file;
}
+ $realPathName = $this->getRealPathName($file->pathname);
+ $file->realPath = $this->savePath . $realPathName;
+ $file->webPath = $this->webPath . $realPathName;
+
return $file;
}
+ /**
+ * Get files by ID list.
+ *
+ * @param int $fileIdList
+ * @access public
+ * @return array
+ */
+ public function getByIdList($fileIdList)
+ {
+ if(empty($fileIdList)) return array();
+
+ $files = $this->dao->select('*')->from(TABLE_FILE)->where('id')->in($fileIdList)->orderBy('id')->fetchAll('id');
+
+ foreach($files as $file)
+ {
+ if($file->objectType == 'traincourse' or $file->objectType == 'traincontents')
+ {
+ $file->realPath = $this->app->getWwwRoot() . 'data/course/' . $file->pathname;
+ $file->webPath = 'data/course/' . $file->pathname;
+ continue;
+ }
+
+ $realPathName = $this->getRealPathName($file->pathname);
+ $file->realPath = $this->savePath . $realPathName;
+ $file->webPath = $this->webPath . $realPathName;
+ }
+
+ return $files;
+ }
+
/**
* Save upload.
*
@@ -1121,60 +1138,33 @@ class fileModel extends model
}
/**
- * Update version of story files.
+ * Process file info for object.
*
- * @param int $storyID
- * @param int $storyVersion
- * @param array $deleteFiles
+ * @param string $objectType
+ * @param object $oldObject
+ * @param object $newObject
* @access public
* @return void
*/
- public function updateStoryFileVersion($storyID, $storyVersion, $deleteFiles = array())
+ public function processFile4Object($objectType, $oldObject, $newObject)
{
- $oldStoryVersion = $storyVersion - 1;
- $this->dao->update(TABLE_FILE)->set("extra = CONCAT(extra, '$storyVersion,')")
- ->where('objectType')->in('story,requirement')
- ->andWhere('objectID')->eq($storyID)
- ->andWhere('extra')->like("%,$oldStoryVersion,%")
- ->beginIF(!empty($deleteFiles))->andWhere('id')->notin($deleteFiles)->fi()
- ->exec();
- }
-
- /**
- * Delete story file.
- *
- * @param int $storyID
- * @param int $storyVersion
- * @param array $deleteFiles
- * @access public
- * @return void
- */
- public function deleteStoryFile($storyID, $storyVersion, $deleteFiles = array())
- {
- $deleteFileList = $this->dao->select('*')->from(TABLE_FILE)
- ->where('objectType')->in('story,requirement')
- ->andWhere('objectID')->eq($storyID)
- ->andWhere('extra')->eq(",$storyVersion,")
- ->beginIF(!empty($deleteFiles))->andWhere('id')->in($deleteFiles)->fi()
- ->fetchAll('id');
-
- if(!empty($deleteFileList))
+ $oldFiles = empty($oldObject->files) ? '' : join(',', array_keys($oldObject->files));
+ $deleteFiles = $newObject->deleteFiles;
+ if(!empty($deleteFiles))
{
- $this->dao->delete()->from(TABLE_FILE)->where('id')->in(array_keys($deleteFileList))->exec();
-
- foreach($deleteFileList as $file)
+ $this->dao->delete()->from(TABLE_FILE)->where('id')->in($deleteFiles)->exec();
+ foreach($deleteFiles as $fileID)
{
- $realPathName = $this->getRealPathName($file->pathname);
- @unlink($realPathName);
+ @unlink($oldObject->files[$fileID]->realPath);
+ $oldFiles = empty($oldFiles) ? '' : trim(str_replace(",$fileID,", ',', ",$oldFiles,"), ',');
}
}
- /* When the file is in multiple story versions, 'extra' need delete the version to be deleted. */
- $this->dao->update(TABLE_FILE)->set("extra = REPLACE(extra, '$storyVersion,', '')")
- ->where('objectType')->in('story,requirement')
- ->andWhere('objectID')->eq($storyID)
- ->andWhere('extra')->like("%,$storyVersion,%")
- ->beginIF(!empty($deleteFiles))->andWhere('id')->in($deleteFiles)->fi()
- ->exec();
+ $this->updateObjectID($this->post->uid, $oldObject->id, $objectType);
+ $addedFiles = $this->saveUpload($objectType, $oldObject->id);
+ $addedFiles = empty($addedFiles) ? '' : ',' . join(',', array_keys($addedFiles));
+
+ $newObject->files = trim($oldFiles . $addedFiles, ',');
+ $oldObject->files = join(',', array_keys($oldObject->files));
}
}
diff --git a/module/holiday/model.php b/module/holiday/model.php
index ca538c2936..e43442f049 100644
--- a/module/holiday/model.php
+++ b/module/holiday/model.php
@@ -205,21 +205,19 @@ class holidayModel extends model
$workingDays = $this->getWorkingDays($begin, $end);
$weekend = isset($this->config->project->weekend) ? $this->config->project->weekend : 2;
+ $holidaysFlip = array_flip($holidays);
+ $workingDaysFlip = array_flip($workingDays);
+
/* When the start date and end date are the same. */
+ $beginTimestamp = strtotime($begin);
if($begin == $end)
{
- if(in_array($begin, $workingDays)) return $actualDays[] = $begin;
- if(in_array($begin, $holidays)) return $actualDays;
+ if(isset($workingDaysFlip[$begin])) return $actualDays[] = $begin;
+ if(isset($holidaysFlip[$begin])) return $actualDays;
- $w = date('w', strtotime($begin));
- if($weekend == 2)
- {
- if($w == 0 or $w == 6) return $actualDays;
- }
- else
- {
- if($w == 0) return $actualDays;
- }
+ $w = date('w', $beginTimestamp);
+ if($weekend == 2 and ($w == 0 or $w == 6)) return $actualDays;
+ if($weekend != 2 and $w == 0) return $actualDays;
$actualDays[] = $begin;
return $actualDays;
@@ -227,24 +225,21 @@ class holidayModel extends model
for($i = 0; $currentDay < $end; $i ++)
{
- $currentDay = date('Y-m-d', strtotime("$begin + $i days"));
- $w = date('w', strtotime($currentDay));
+ $currentTimestamp = $beginTimestamp + ($i * 24 * 3600);
+ $currentDay = date('Y-m-d', $currentTimestamp);
- if(in_array($currentDay, $workingDays))
+ if(isset($workingDaysFlip[$currentDay]))
{
$actualDays[] = $currentDay;
continue;
}
- if(in_array($currentDay, $holidays)) continue;
- if($weekend == 2)
- {
- if($w == 0 or $w == 6) continue;
- }
- else
- {
- if($w == 0) continue;
- }
+ if(isset($holidaysFlip[$currentDay])) continue;
+
+ $w = date('w', $currentTimestamp);
+ if($weekend == 2 and ($w == 0 or $w == 6)) continue;
+ if($weekend != 2 and $w == 0) continue;
+
$actualDays[] = $currentDay;
}
@@ -266,7 +261,7 @@ class holidayModel extends model
$days = ($endTime - $beginTime) / 86400;
$dateList = array();
- for($i = 0; $i <= $days; $i ++) $dateList[] = date('Y-m-d', strtotime("+$i days", $beginTime));
+ for($i = 0; $i <= $days; $i ++) $dateList[] = date('Y-m-d', $beginTime + ($i *24 *3600));
return $dateList;
}
diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index 65bdeaadaa..bb82e5a9d2 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = 'The concept of interface has been added since 16.5. Users can deal with R & D affairs in [R&D] and daily office affairs in [Lite].
You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.
";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
+$lang->misc->releaseDate['17.6.1'] = '2022-09-08';
$lang->misc->releaseDate['17.6'] = '2022-08-26';
$lang->misc->releaseDate['17.5'] = '2022-08-11';
$lang->misc->releaseDate['17.4'] = '2022-07-27';
@@ -188,6 +189,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['17.6.1'][] = array('title' => "Optimized the processing logic of multi-member tasks. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.6'][] = array('title' => "The processing logic of requirements is optimized, and the permissions of user requirements and soft requirements are split. Gantt chart supports manual drag and drop to manage task relationship. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.5'][] = array('title' => "Provide efficient visual statistical tools. Optimize ZenTao performance, the database engine is adjusted from MyISAM to InnoDB. Gantt chart is optimized and upgraded, and the Copy items of the Max version can replicate more information. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.4'][] = array('title' => "Optimization of details Page visualization and jumping page logic. Improvement of Kanban function. Optimization of document creating and editing pages. Fix bugs.", 'desc' => '');
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index c7162f833d..78ccf22fe1 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = 'The concept of interface has been added since 16.5. Users can deal with R & D affairs in [R&D] and daily office affairs in [Lite].
You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.
";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
+$lang->misc->releaseDate['17.6.1'] = '2022-09-08';
$lang->misc->releaseDate['17.6'] = '2022-08-26';
$lang->misc->releaseDate['17.5'] = '2022-08-11';
$lang->misc->releaseDate['17.4'] = '2022-07-27';
@@ -188,6 +189,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['17.6.1'][] = array('title' => "Optimized the processing logic of multi-member tasks. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.6'][] = array('title' => "The processing logic of requirements is optimized, and the permissions of user requirements and soft requirements are split. Gantt chart supports manual drag and drop to manage task relationship. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.5'][] = array('title' => "Provide efficient visual statistical tools. Optimize ZenTao performance, the database engine is adjusted from MyISAM to InnoDB. Gantt chart is optimized and upgraded, and the Copy items of the Max version can replicate more information. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.4'][] = array('title' => "Optimization of details Page visualization and jumping page logic. Improvement of Kanban function. Optimization of document creating and editing pages. Fix bugs.", 'desc' => '');
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index 42b4ec297c..9c538829d4 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = 'The concept of interface has been added since 16.5. Users can deal with R & D affairs in [R&D] and daily office affairs in [Lite].
You can view the current interface on the avatar, and click the name of the interface to view and switch other interfaces.
";
$lang->misc->feature->visionsImage = 'theme/default/images/main/visions_en.png';
+$lang->misc->releaseDate['17.6.1'] = '2022-09-08';
$lang->misc->releaseDate['17.6'] = '2022-08-26';
$lang->misc->releaseDate['17.5'] = '2022-08-11';
$lang->misc->releaseDate['17.4'] = '2022-07-27';
@@ -188,6 +189,7 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22';
$lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
+$lang->misc->feature->all['17.6.1'][] = array('title' => "Optimized the processing logic of multi-member tasks. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.6'][] = array('title' => "The processing logic of requirements is optimized, and the permissions of user requirements and soft requirements are split. Gantt chart supports manual drag and drop to manage task relationship. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.5'][] = array('title' => "Provide efficient visual statistical tools. Optimize ZenTao performance, the database engine is adjusted from MyISAM to InnoDB. Gantt chart is optimized and upgraded, and the Copy items of the Max version can replicate more information. Fix bugs.", 'desc' => '');
$lang->misc->feature->all['17.4'][] = array('title' => "Optimization of details Page visualization and jumping page logic. Improvement of Kanban function. Optimization of document creating and editing pages. Fix bugs.", 'desc' => '');
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 48fbcff978..e0beccf40e 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -103,6 +103,7 @@ $lang->misc->feature->themeDesc = "
diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
index 801b54a2fc..ba37f91c67 100644
--- a/module/release/view/view.html.php
+++ b/module/release/view/view.html.php
@@ -373,11 +373,11 @@
files?>
-
+
files)
{
- echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false'));
+ echo $this->fetch('file', 'printFiles', array('files' => $release->files, 'fieldset' => 'false', 'object' => $release, 'method' => 'view', 'showDelete' => false));
}
elseif($release->filePath)
{
diff --git a/module/story/control.php b/module/story/control.php
index da2e97f5ca..5ecf59f8c1 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -863,7 +863,6 @@ class story extends control
$this->view->reviewers = array_keys($reviewerList);
$this->view->reviewedReviewer = $reviewedReviewer;
$this->view->productReviewers = $this->user->getPairs('noclosed|nodeleted', array_keys($reviewerList), 0, $productReviewers);
- $this->view->files = $this->file->getByObject($story->type, $storyID, $story->version);
$this->display();
}
@@ -1080,25 +1079,17 @@ class story extends control
$this->loadModel('file');
if(!empty($_POST))
{
- $deleteFiles = isset($_POST['deleteFiles']) ? $this->file->getPairs($_POST['deleteFiles'], 'title') : array();
- $changes = $this->story->change($storyID);
+ $changes = $this->story->change($storyID);
if(dao::isError())
{
if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'message' => dao::getError()));
return print(js::error(dao::getError()));
}
- $story = $this->story->getByID($storyID);
- $version = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch('version');
- $files = $this->file->saveUpload($story->type, $storyID, ",$version,");
- if(empty($files) and $this->post->uid != '' and isset($_SESSION['album']['used'][$this->post->uid])) $files = $this->file->getPairs($_SESSION['album']['used'][$this->post->uid]);
-
- if($this->post->comment != '' or !empty($changes) or !empty($files) or !empty($deleteFiles))
+ if($this->post->comment != '' or !empty($changes))
{
- $action = (!empty($changes) or !empty($files)) ? 'Changed' : 'Commented';
- $fileAction = empty($files) ? '' : $this->lang->addFiles . join(',', $files) . "\n" ;
- $fileAction .= empty($deleteFiles) ? '' : $this->lang->deleteFiles . join(',', $deleteFiles) . "\n";
- $actionID = $this->action->create('story', $storyID, $action, $fileAction . $this->post->comment);
+ $action = !empty($changes) ? 'Changed' : 'Commented';
+ $actionID = $this->action->create('story', $storyID, $action, $this->post->comment);
$this->action->logHistory($actionID, $changes);
}
@@ -1148,7 +1139,7 @@ class story extends control
$this->app->loadLang('testcase');
$this->app->loadLang('execution');
- $story = $this->story->getById($storyID);
+ $story = $this->view->story;
$reviewer = $this->story->getReviewerPairs($storyID, $story->version);
$product = $this->loadModel('product')->getByID($story->product);
@@ -1163,7 +1154,6 @@ class story extends control
$this->view->needReview = (($this->app->user->account == $this->view->product->PO or $this->config->story->needReview == 0) and empty($reviewer)) ? "checked='checked'" : "";
$this->view->reviewer = implode(',', array_keys($reviewer));
$this->view->productReviewers = $this->user->getPairs('noclosed|nodeleted', $reviewer, 0, $productReviewers);
- $this->view->files = $this->file->getByObject($story->type, $storyID, $story->version);
$this->display();
}
@@ -1250,7 +1240,6 @@ class story extends control
$this->story->replaceURLang($story->type);
- $story->files = $this->loadModel('file')->getByObject($story->type, $storyID, $version);
$product = $this->dao->findById($story->product)->from(TABLE_PRODUCT)->fields('name, id, type, status')->fetch();
$plan = $this->dao->findById($story->plan)->from(TABLE_PRODUCTPLAN)->fetch('title');
$bugs = $this->dao->select('id,title,status,pri,severity')->from(TABLE_BUG)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll();
diff --git a/module/story/model.php b/module/story/model.php
index 93040402d1..2a0827c32a 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -30,18 +30,20 @@ class storyModel extends model
->fetch();
if(!$story) return false;
+ $this->loadModel('file');
if(helper::isZeroDate($story->closedDate)) $story->closedDate = '';
if($version == 0) $version = $story->version;
- $spec = $this->dao->select('title,spec,verify')->from(TABLE_STORYSPEC)->where('story')->eq($storyID)->andWhere('version')->eq($version)->fetch();
+ $spec = $this->dao->select('title,spec,verify,files')->from(TABLE_STORYSPEC)->where('story')->eq($storyID)->andWhere('version')->eq($version)->fetch();
$story->title = isset($spec->title) ? $spec->title : '';
$story->spec = isset($spec->spec) ? $spec->spec : '';
$story->verify = isset($spec->verify) ? $spec->verify : '';
+ $story->files = isset($spec->files) ? $this->file->getByIdList($spec->files) : '';
if(!empty($story->fromStory)) $story->sourceName = $this->dao->select('title')->from(TABLE_STORY)->where('id')->eq($story->fromStory)->fetch('title');
/* Check parent story. */
if($story->parent > 0) $story->parentName = $this->dao->findById($story->parent)->from(TABLE_STORY)->fetch('title');
- $story = $this->loadModel('file')->replaceImgURL($story, 'spec,verify');
+ $story = $this->file->replaceImgURL($story, 'spec,verify');
if($setImgSize) $story->spec = $this->file->setImgSize($story->spec);
if($setImgSize) $story->verify = $this->file->setImgSize($story->verify);
@@ -264,21 +266,22 @@ class storyModel extends model
$this->subdivide($story->parent, $stories);
}
- $this->file->updateObjectID($this->post->uid, $storyID, $story->type);
- $this->file->saveUpload($story->type, $storyID, ',1,');
-
if(!empty($story->plan))
{
$this->updateStoryOrderOfPlan($storyID, $story->plan); // Set story order in this plan.
$this->loadModel('action')->create('productplan', $story->plan, 'linkstory', '', $storyID);
}
+ $this->file->updateObjectID($this->post->uid, $storyID, $story->type);
+ $files = $this->file->saveUpload($story->type, $storyID, 1);
+
$data = new stdclass();
$data->story = $storyID;
$data->version = 1;
$data->title = $story->title;
$data->spec = $story->spec;
$data->verify = $story->verify;
+ $data->files = join(',', array_keys($files));
$this->dao->insert(TABLE_STORYSPEC)->data($data)->exec();
/* Save the story reviewer to storyreview table. */
@@ -658,11 +661,7 @@ class storyModel extends model
public function change($storyID)
{
$specChanged = false;
- $oldStory = $this->dao->findById((int)$storyID)->from(TABLE_STORY)->fetch();
- $oldSpec = $this->dao->select('title,spec,verify')->from(TABLE_STORYSPEC)->where('story')->eq((int)$storyID)->andWhere('version')->eq($oldStory->version)->fetch();
- $oldStory->title = isset($oldSpec->title) ? $oldSpec->title : '';
- $oldStory->spec = isset($oldSpec->spec) ? $oldSpec->spec : '';
- $oldStory->verify = isset($oldSpec->verify) ? $oldSpec->verify : '';
+ $oldStory = $this->getById($storyID);
if(!empty($_POST['lastEditedDate']) and $oldStory->lastEditedDate != $this->post->lastEditedDate)
{
@@ -688,12 +687,13 @@ class storyModel extends model
$oldStoryReviewers = $this->getReviewerPairs($storyID, $oldStory->version);
$_POST['reviewer'] = isset($_POST['reviewer']) ? $_POST['reviewer'] : array();
$reviewerHasChanged = (array_diff(array_keys($oldStoryReviewers), $_POST['reviewer']) or array_diff($_POST['reviewer'], array_keys($oldStoryReviewers)));
- if($story->spec != $oldStory->spec or $story->verify != $oldStory->verify or $story->title != $oldStory->title or $this->loadModel('file')->getCount() or $reviewerHasChanged or isset($_POST['deleteFiles'])) $specChanged = true;
+ if($story->spec != $oldStory->spec or $story->verify != $oldStory->verify or $story->title != $oldStory->title or $this->loadModel('file')->getCount() or $reviewerHasChanged or isset($story->deleteFiles)) $specChanged = true;
$now = helper::now();
$story = fixer::input('post')
->callFunc('title', 'trim')
->setDefault('lastEditedBy', $this->app->user->account)
+ ->setDefault('deleteFiles', array())
->add('id', $storyID)
->add('lastEditedDate', $now)
->setIF($specChanged, 'version', $oldStory->version + 1)
@@ -706,11 +706,11 @@ class storyModel extends model
->setIF($specChanged and $oldStory->closedBy, 'closedDate', '0000-00-00')
->setIF(!$specChanged, 'status', $oldStory->status)
->stripTags($this->config->story->editor->change['id'], $this->config->allowedTags)
- ->remove('files,labels,reviewer,comment,needNotReview,uid,deleteFiles')
+ ->remove('files,labels,reviewer,comment,needNotReview,uid')
->get();
$story = $this->loadModel('file')->processImgURL($story, $this->config->story->editor->change['id'], $this->post->uid);
- $this->dao->update(TABLE_STORY)->data($story, 'spec,verify')
+ $this->dao->update(TABLE_STORY)->data($story, 'spec,verify,deleteFiles')
->autoCheck()
->batchCheck($this->config->story->change->requiredFields, 'notempty')
->checkFlow()
@@ -720,20 +720,27 @@ class storyModel extends model
{
if($specChanged)
{
+ $this->file->updateObjectID($this->post->uid, $storyID, 'story');
+ $addedFiles = $this->file->saveUpload($oldStory->type, $storyID, $story->version);
+ $addedFiles = empty($addedFiles) ? '' : join(',', array_keys($addedFiles)) . ',';
+ $storyFiles = $oldStory->files = join(',', array_keys($oldStory->files));
+ foreach($story->deleteFiles as $fileID) $storyFiles = str_replace(",$fileID,", ',', ",$storyFiles,");
+
$data = new stdclass();
$data->story = $storyID;
- $data->version = $oldStory->version + 1;
+ $data->version = $story->version;
$data->title = $story->title;
$data->spec = $story->spec;
$data->verify = $story->verify;
+ $data->files = $story->files = $addedFiles . trim($storyFiles, ',');
$this->dao->insert(TABLE_STORYSPEC)->data($data)->exec();
- $story = $this->getById($storyID);
/* IF is story and has changed, update its relation version to new. */
if($oldStory->type == 'story')
{
+ $newStory = $this->getById($storyID);
$this->dao->update(TABLE_STORY)->set('URChanged')->eq(0)->where('id')->eq($oldStory->id)->exec();
- $this->updateStoryVersion($story);
+ $this->updateStoryVersion($newStory);
}
else
{
@@ -742,7 +749,7 @@ class storyModel extends model
->where('AType')->eq('requirement')
->andWhere('BType')->eq('story')
->andWhere('relation')->eq('subdivideinto')
- ->andWhere('AID')->eq($story->id)
+ ->andWhere('AID')->eq($storyID)
->fetchPairs();
foreach($relations as $relationID) $this->dao->update(TABLE_STORY)->set('URChanged')->eq(1)->where('id')->eq($relationID)->exec();
@@ -763,13 +770,8 @@ class storyModel extends model
$oldStory->reviewers = implode(',', array_keys($oldStoryReviewers));
$story->reviewers = implode(',', $_POST['reviewer']);
}
-
- $deleteFiles = isset($_POST['deleteFiles']) ? $_POST['deleteFiles'] : array();
- if(!empty($deleteFiles)) $this->file->deleteStoryFile($story->id, $story->version, $deleteFiles);
- $this->file->updateStoryFileVersion($story->id, $story->version, $deleteFiles);
}
- $this->file->updateObjectID($this->post->uid, $storyID, 'story');
return common::createChanges($oldStory, $story);
}
}
@@ -784,7 +786,7 @@ class storyModel extends model
public function update($storyID)
{
$now = helper::now();
- $oldStory = $this->dao->select('*')->from(TABLE_STORY)->where('id')->eq($storyID)->fetch();
+ $oldStory = $this->getById($storyID);
if(!empty($_POST['lastEditedDate']) and $oldStory->lastEditedDate != $this->post->lastEditedDate)
{
dao::$errors[] = $this->lang->error->editedByOther;
@@ -797,11 +799,6 @@ class storyModel extends model
return false;
}
- $oldSpec = $this->dao->select('title,spec,verify')->from(TABLE_STORYSPEC)->where('story')->eq((int)$storyID)->andWhere('version')->eq($oldStory->version)->fetch();
- $oldStory->title = isset($oldSpec->title) ? $oldSpec->title : '';
- $oldStory->spec = isset($oldSpec->spec) ? $oldSpec->spec : '';
- $oldStory->verify = isset($oldSpec->verify) ? $oldSpec->verify : '';
-
$story = fixer::input('post')
->cleanInt('product,module,pri,duplicateStory')
->cleanFloat('estimate')
@@ -812,6 +809,7 @@ class storyModel extends model
->setDefault('spec', $oldStory->spec)
->setDefault('verify', $oldStory->verify)
->setDefault('mailto', '')
+ ->setDefault('deleteFiles', array())
->add('id', $storyID)
->add('lastEditedDate', $now)
->setDefault('plan,notifyEmail', '')
@@ -831,7 +829,7 @@ class storyModel extends model
->join('linkStories', ',')
->join('linkRequirements', ',')
->join('childStories', ',')
- ->remove('files,labels,comment,contactListMenu,stages,reviewer,needNotReview,deleteFiles')
+ ->remove('files,labels,comment,contactListMenu,stages,reviewer,needNotReview')
->get();
if($oldStory->type == 'story' and !isset($story->linkStories)) $story->linkStories = '';
@@ -877,34 +875,34 @@ class storyModel extends model
{
$_POST['reviewer'] = isset($_POST['needNotReview']) ? array() : array_filter($_POST['reviewer']);
$oldReviewer = $this->getReviewerPairs($storyID, $oldStory->version);
- if(array_diff($_POST['reviewer'], array_keys($oldReviewer)) or array_diff(array_keys($oldReviewer), $_POST['reviewer']))
+
+ /* Update story reviewer. */
+ $this->dao->delete()->from(TABLE_STORYREVIEW)
+ ->where('story')->eq($storyID)
+ ->andWhere('version')->eq($oldStory->version)
+ ->beginIF($oldStory->status == 'reviewing')->andWhere('reviewer')->notin(implode(',', $_POST['reviewer']))
+ ->exec();
+
+ foreach($_POST['reviewer'] as $reviewer)
{
- /* Update story reviewer. */
- $this->dao->delete()->from(TABLE_STORYREVIEW)->where('story')->eq($storyID)->andWhere('version')->eq($oldStory->version)->andWhere('reviewer')->notin(implode(',', $_POST['reviewer']))->exec();
- foreach($_POST['reviewer'] as $reviewer)
- {
- if(in_array($reviewer, array_keys($oldReviewer))) continue;
+ if($oldStory->status == 'reviewing' and in_array($reviewer, array_keys($oldReviewer))) continue;
- $reviewData = new stdclass();
- $reviewData->story = $storyID;
- $reviewData->version = $oldStory->version;
- $reviewData->reviewer = $reviewer;
- $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
- }
-
- if($story->status == 'reviewing')
- {
- $story->reviewedBy = $oldStory->reviewedBy;
- $story = $this->updateStoryByReview($storyID, $oldStory, $story);
- }
+ $reviewData = new stdclass();
+ $reviewData->story = $storyID;
+ $reviewData->version = $oldStory->version;
+ $reviewData->reviewer = $reviewer;
+ $this->dao->insert(TABLE_STORYREVIEW)->data($reviewData)->exec();
}
+ if($oldStory->status == 'reviewing') $story = $this->updateStoryByReview($storyID, $oldStory, $story);
+ if(strpos('draft,changing', $oldStory->status) != false) $story->reviewedBy = '';
+
$oldStory->reviewers = implode(',', array_keys($oldReviewer));
$story->reviewers = implode(',', array_keys($this->getReviewerPairs($storyID, $oldStory->version)));
}
$this->dao->update(TABLE_STORY)
- ->data($story, 'reviewers,spec,verify,finalResult')
+ ->data($story, 'reviewers,spec,verify,finalResult,deleteFiles')
->autoCheck()
->checkIF(isset($story->closedBy), 'closedReason', 'notempty')
->checkIF(isset($story->closedReason) and $story->closedReason == 'done', 'stage', 'notempty')
@@ -916,12 +914,20 @@ class storyModel extends model
if(!dao::isError())
{
- if($story->spec != $oldStory->spec or $story->verify != $oldStory->verify or $story->title != $oldStory->title)
+ $this->file->updateObjectID($this->post->uid, $storyID, 'story');
+ $addedFiles = $this->file->saveUpload($oldStory->type, $storyID, $oldStory->version);
+
+ if($story->spec != $oldStory->spec or $story->verify != $oldStory->verify or $story->title != $oldStory->title or !empty($story->deleteFiles) or !empty($addedFiles))
{
+ $addedFiles = empty($addedFiles) ? '' : join(',', array_keys($addedFiles)) . ',';
+ $storyFiles = $oldStory->files = join(',', array_keys($oldStory->files));
+ foreach($story->deleteFiles as $fileID) $storyFiles = str_replace(",$fileID,", ',', ",$storyFiles,");
+
$data = new stdclass();
$data->title = $story->title;
$data->spec = $story->spec;
$data->verify = $story->verify;
+ $data->files = $story->files = $addedFiles . trim($storyFiles, ',');
$this->dao->update(TABLE_STORYSPEC)->data($data)->where('story')->eq((int)$storyID)->andWhere('version')->eq($oldStory->version)->exec();
}
@@ -1040,21 +1046,13 @@ class storyModel extends model
}
}
- $changes = common::createChanges($oldStory, $story);
- $deleteFiles = isset($_POST['deleteFiles']) ? $this->file->getPairs($_POST['deleteFiles'], 'title') : array();
-
- if(isset($_POST['deleteFiles'])) $this->file->deleteStoryFile($storyID, $oldStory->version, $_POST['deleteFiles']);
- $this->file->updateObjectID($this->post->uid, $storyID, 'story');
-
- $files = $this->file->saveUpload($oldStory->type, $storyID, ",$oldStory->version,");
+ $changes = common::createChanges($oldStory, $story);
if(empty($files) and $this->post->uid != '' and isset($_SESSION['album']['used'][$this->post->uid])) $files = $this->file->getPairs($_SESSION['album']['used'][$this->post->uid]);
- if($this->post->comment != '' or !empty($changes) or !empty($files) or !empty($deleteFiles))
+ if($this->post->comment != '' or !empty($changes))
{
- $action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented';
- $fileAction = empty($files) ? '' : $this->lang->addFiles . join(',', $files) . "\n" ;
- $fileAction .= empty($deleteFiles) ? '' : $this->lang->deleteFiles . join(',', $deleteFiles) . "\n";
- $actionID = $this->action->create('story', $storyID, $action, $fileAction . $this->post->comment);
+ $action = !empty($changes) ? 'Edited' : 'Commented';
+ $actionID = $this->action->create('story', $storyID, $action, $this->post->comment);
$this->action->logHistory($actionID, $changes);
if(isset($story->finalResult)) $this->recordReviewAction($story);
@@ -1609,8 +1607,6 @@ class storyModel extends model
/* Delete versions that is after this version. */
$this->dao->delete()->from(TABLE_STORYSPEC)->where('story')->eq($storyID)->andWHere('version')->eq($story->version)->exec();
$this->dao->delete()->from(TABLE_STORYREVIEW)->where('story')->eq($storyID)->andWhere('version')->eq($story->version)->exec();
-
- $this->loadModel('file')->deleteStoryFile($storyID, $story->version);
}
/**
@@ -5620,8 +5616,6 @@ class storyModel extends model
/* Delete versions that is after this version. */
$this->dao->delete()->from(TABLE_STORYSPEC)->where('story')->eq($story->id)->andWHere('version')->in($oldStory->version)->exec();
$this->dao->delete()->from(TABLE_STORYREVIEW)->where('story')->eq($story->id)->andWhere('version')->in($oldStory->version)->exec();
-
- $this->file->deleteStoryFile($story->id, $oldStory->version);
}
if($result == 'reject')
diff --git a/module/story/view/change.html.php b/module/story/view/change.html.php
index 157e16aed3..af6fcf4670 100644
--- a/module/story/view/change.html.php
+++ b/module/story/view/change.html.php
@@ -68,7 +68,7 @@
| attatch;?> |
- fetch('file', 'printFiles', array('files' => $files, 'fieldset' => 'false', 'object' => $story, 'method' => 'edit'));?>
+ fetch('file', 'printFiles', array('files' => $story->files, 'fieldset' => 'false', 'object' => $story, 'method' => 'edit'));?>
fetch('file', 'buildform');?>
|
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 62528e92cd..9ee361c6cb 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -85,13 +85,13 @@
status) !== false ? html::textarea('verify', htmlSpecialString($story->verify), "rows='5' class='form-control'") : $story->verify;?>
- status) === false and empty($files)) ? false : true;?>
+ status) === false and empty($story->files)) ? false : true;?>
attatch;?>
status) !== false ? true : false;?>
- fetch('file', 'printFiles', array('files' => $files, 'fieldset' => 'false', 'object' => $story, 'method' => 'edit', 'showDelete' => $canChangeFile));?>
+ fetch('file', 'printFiles', array('files' => $story->files, 'fieldset' => 'false', 'object' => $story, 'method' => 'edit', 'showDelete' => $canChangeFile));?>
fetch('file', 'buildform') : '';?>
diff --git a/module/task/control.php b/module/task/control.php
index 6125de6866..fd13be6643 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -537,20 +537,16 @@ class task extends control
{
$this->loadModel('action');
$changes = array();
- $files = array();
if($comment == false)
{
$changes = $this->task->update($taskID);
if(dao::isError()) return print(js::error(dao::getError()));
- $files = $this->loadModel('file')->saveUpload('task', $taskID);
- if(empty($files) and $this->post->uid != '' and isset($_SESSION['album']['used'][$this->post->uid])) $files = $this->file->getPairs($_SESSION['album']['used'][$this->post->uid]);
}
- if($this->post->comment != '' or !empty($changes) or !empty($files))
+ if($this->post->comment != '' or !empty($changes))
{
- $action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented';
- $fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : '';
- $actionID = $this->action->create('task', $taskID, $action, $fileAction . $this->post->comment);
+ $action = !empty($changes) ? 'Edited' : 'Commented';
+ $actionID = $this->action->create('task', $taskID, $action, $this->post->comment);
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
}
diff --git a/module/task/css/recordestimate.css b/module/task/css/recordestimate.css
index 41a33d7a0d..3a3a23d572 100644
--- a/module/task/css/recordestimate.css
+++ b/module/task/css/recordestimate.css
@@ -13,3 +13,4 @@
.icon-calendar {color: rgb(22, 168, 248)}
#recordForm .table>thead>tr>th{ border: none}
.main-header {border-bottom: none !important}
+.body-modal .main-header>h2 { max-width: 70% !important;}
diff --git a/module/task/css/view.css b/module/task/css/view.css
index 2791ac7347..dcfd252afb 100644
--- a/module/task/css/view.css
+++ b/module/task/css/view.css
@@ -19,3 +19,6 @@
.c-actions {width: 175px;}
[lang^='de'] #mainContent .main-actions .btn-toolbar .btn {padding-left: 3px; padding-right: 3px;}
+
+#childrenTable .c-id {width: 60px;}
+#childrenTable .c-lblPri {width: 50px;}
diff --git a/module/task/js/activate.js b/module/task/js/activate.js
index c4aacfa326..bbaa94f90e 100644
--- a/module/task/js/activate.js
+++ b/module/task/js/activate.js
@@ -14,7 +14,7 @@ $('#confirmButton').click(function()
var $tr = $(this).closest('tr');
var account = $(this).find('option:selected').text();
- estimate = parseFloat($tr.find('[name^=teamEstimate]').val());
+ var estimate = parseFloat($tr.find('[name^=teamEstimate]').val());
if(!isNaN(estimate)) totalEstimate += estimate;
if(isNaN(estimate) || estimate == 0)
{
@@ -23,12 +23,13 @@ $('#confirmButton').click(function()
return false;
}
- consumed = parseFloat($tr.find('[name^=teamConsumed]').val());
+ var consumed = parseFloat($tr.find('[name^=teamConsumed]').val());
if(!isNaN(consumed)) totalConsumed += consumed;
- left = parseFloat($tr.find('[name^=teamLeft]').val());
+ var $left = $tr.find('[name^=teamLeft]');
+ var left = parseFloat($left.val());
if(!isNaN(left)) totalLeft += left;
- if(!$tr.hasClass('member-done') && (isNaN(left) || left == 0))
+ if(!$left.prop('readonly') && (isNaN(left) || left == 0))
{
bootbox.alert(account + ' ' + leftNotEmpty);
error = true;
diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index f59094b8fd..8c6147bb47 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -97,7 +97,7 @@ $('#confirmButton').click(function()
var $tr = $(this).closest('tr');
var account = $(this).find('option:selected').text();
- estimate = parseFloat($tr.find('[name^=teamEstimate]').val());
+ var estimate = parseFloat($tr.find('[name^=teamEstimate]').val());
if(!isNaN(estimate)) totalEstimate += estimate;
if(isNaN(estimate) || estimate == 0)
{
@@ -106,12 +106,13 @@ $('#confirmButton').click(function()
return false;
}
- consumed = parseFloat($tr.find('[name^=teamConsumed]').val());
+ var consumed = parseFloat($tr.find('[name^=teamConsumed]').val());
if(!isNaN(consumed)) totalConsumed += consumed;
- left = parseFloat($tr.find('[name^=teamLeft]').val());
+ var $left = $tr.find('[name^=teamLeft]');
+ var left = parseFloat($left.val());
if(!isNaN(left)) totalLeft += left;
- if(!$tr.hasClass('member-done') && (isNaN(left) || left == 0))
+ if(!$left.prop('readonly') && (isNaN(left) || left == 0))
{
bootbox.alert(account + ' ' + leftNotEmpty);
error = true;
diff --git a/module/task/lang/de.php b/module/task/lang/de.php
index 274ede3ade..4aaea21c45 100644
--- a/module/task/lang/de.php
+++ b/module/task/lang/de.php
@@ -47,6 +47,7 @@ $lang->task->exportAction = "Export Task";
$lang->task->reportChart = "Bericht Chart";
$lang->task->fromBug = 'Von Bug';
$lang->task->case = 'Fall';
+$lang->task->process = 'Process Task';
$lang->task->confirmStoryChange = "Storyäanderung bestätigen";
$lang->task->storyChange = "Story Changed";
$lang->task->progress = 'Fortschritt';
@@ -57,7 +58,7 @@ $lang->task->waitTask = 'Waiting Task';
$lang->task->allModule = 'All Module';
$lang->task->replace = 'Replace';
$lang->task->myEffort = 'My Effort';
-$lang->task->allEffort = 'All Effort';
+$lang->task->allEffort = 'Team Effort';
$lang->task->teamOrder = 'Order';
$lang->task->common = 'Aufgabe';
diff --git a/module/task/lang/en.php b/module/task/lang/en.php
index c09efd9985..e4ddff1baa 100755
--- a/module/task/lang/en.php
+++ b/module/task/lang/en.php
@@ -47,6 +47,7 @@ $lang->task->exportAction = "Export Task";
$lang->task->reportChart = "Report Chart";
$lang->task->fromBug = 'From Bug';
$lang->task->case = 'Linked Case';
+$lang->task->process = 'Process Task';
$lang->task->confirmStoryChange = "Confirm Change";
$lang->task->storyChange = "Story Changed";
$lang->task->progress = 'Progress';
@@ -57,7 +58,7 @@ $lang->task->waitTask = 'Waiting Task';
$lang->task->allModule = 'All Module';
$lang->task->replace = 'Replace';
$lang->task->myEffort = 'My Effort';
-$lang->task->allEffort = 'All Effort';
+$lang->task->allEffort = 'Team Effort';
$lang->task->teamOrder = 'Order';
$lang->task->common = 'Task';
diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php
index 8b447014b7..2805086107 100644
--- a/module/task/lang/fr.php
+++ b/module/task/lang/fr.php
@@ -47,6 +47,7 @@ $lang->task->exportAction = "Exporter Tâche";
$lang->task->reportChart = "Rapport Graphique";
$lang->task->fromBug = 'à partir Bug';
$lang->task->case = 'Associée CasTest';
+$lang->task->process = 'Process Task';
$lang->task->confirmStoryChange = "Confirmer Changement";
$lang->task->storyChange = "Story Changée";
$lang->task->progress = 'Progression';
@@ -57,7 +58,7 @@ $lang->task->waitTask = 'Tâche en attente';
$lang->task->allModule = 'Tous Modules';
$lang->task->replace = 'Replace';
$lang->task->myEffort = 'My Effort';
-$lang->task->allEffort = 'All Effort';
+$lang->task->allEffort = 'Team Effort';
$lang->task->teamOrder = 'Order';
$lang->task->common = 'Tâche';
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
index a2f5e4cb48..68a589f93d 100755
--- a/module/task/lang/zh-cn.php
+++ b/module/task/lang/zh-cn.php
@@ -47,6 +47,7 @@ $lang->task->exportAction = "导出任务";
$lang->task->reportChart = "报表统计";
$lang->task->fromBug = '来源Bug';
$lang->task->case = '相关用例';
+$lang->task->process = '处理任务';
$lang->task->confirmStoryChange = "确认{$lang->SRCommon}变动";
$lang->task->storyChange = "{$lang->SRCommon}变更";
$lang->task->progress = '进度';
@@ -57,7 +58,7 @@ $lang->task->waitTask = '未开始的任务';
$lang->task->allModule = '所有模块';
$lang->task->replace = '替换';
$lang->task->myEffort = '我的日志';
-$lang->task->allEffort = '所有日志';
+$lang->task->allEffort = '团队日志';
$lang->task->teamOrder = '工序';
$lang->task->common = '任务';
@@ -166,7 +167,7 @@ $lang->task->recordEstimateAction = '添加工时';
$lang->task->ditto = '同上';
$lang->task->dittoNotice = "该任务与上一任务不属于同一%s！";
-$lang->task->selectTestStory = "选择测试{$lang->SRCommon}";
+$lang->task->selectTestStory = "选择{$lang->SRCommon}";
$lang->task->selectAllUser = '全部';
$lang->task->noStory = "无{$lang->SRCommon}";
$lang->task->noAssigned = '未指派';
diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index a54b405789..c9c423564a 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -152,7 +152,7 @@ $lang->task->recordEstimateAction = '添加工時';
$lang->task->ditto = '同上';
$lang->task->dittoNotice = "該任務與上一任務不屬於同一%s！";
-$lang->task->selectTestStory = "選擇測試需求";
+$lang->task->selectTestStory = "選擇{$lang->SRCommon}";
$lang->task->selectAllUser = '全部';
$lang->task->noStory = "無{$lang->SRCommon}";
$lang->task->noAssigned = '未指派';
diff --git a/module/task/model.php b/module/task/model.php
index e90cb1d08e..4e09cc4b6f 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1075,6 +1075,7 @@ class taskModel extends model
->setDefault('story, estimate, left, consumed', 0)
->setDefault('realStarted', '0000-00-00 00:00:00')
->setDefault('mailto', '')
+ ->setDefault('deleteFiles', array())
->setIF(is_numeric($this->post->estimate), 'estimate', (float)$this->post->estimate)
->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed)
->setIF(is_numeric($this->post->left), 'left', (float)$this->post->left)
@@ -1158,7 +1159,7 @@ class taskModel extends model
$requiredFields = trim($requiredFields, ',');
- $this->dao->update(TABLE_TASK)->data($task)
+ $this->dao->update(TABLE_TASK)->data($task, 'deleteFiles')
->autoCheck()
->batchCheckIF($task->status != 'cancel', $requiredFields, 'notempty')
->checkIF(!helper::isZeroDate($task->deadline), 'deadline', 'ge', $task->estStarted)
@@ -1247,12 +1248,10 @@ class taskModel extends model
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
}
}
- $this->file->updateObjectID($this->post->uid, $taskID, 'task');
unset($oldTask->parent);
unset($task->parent);
-
if(($this->config->edition == 'biz' || $this->config->edition == 'max') && $oldTask->feedback) $this->loadModel('feedback')->updateStatus('task', $oldTask->feedback, $task->status, $oldTask->status);
if(isset($oldTask->team))
@@ -1269,6 +1268,7 @@ class taskModel extends model
}
}
+ $this->file->processFile4Object('task', $oldTask, $task);
return common::createChanges($oldTask, $task);
}
}
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index fb56d27a51..bbbc880e28 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -88,7 +88,10 @@ foreach(explode(',', $config->task->edit->requiredFields) as $field)
printExtendFields($task, 'div', 'position=left');?>
files;?>
- fetch('file', 'buildform');?>
+
+ fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'false', 'object' => $task, 'method' => 'edit'));?>
+ fetch('file', 'buildform');?>
+
lastEditedDate);?>
diff --git a/module/task/view/lineareffort.html.php b/module/task/view/lineareffort.html.php
index caff269195..e49b2f7eef 100644
--- a/module/task/view/lineareffort.html.php
+++ b/module/task/view/lineareffort.html.php
@@ -18,7 +18,11 @@ foreach($efforts as $effort)
$account = $effort->account;
$allEfforts[$order][] = $effort;
$recorders[$order][$account] = $account;
- if($app->user->account == $account) $myOrders[$order] = $order;
+ if($app->user->account == $account)
+ {
+ if(!isset($myOrders[$order])) $myOrders[$order] = 0;
+ $myOrders[$order] += 1;
+ }
}
?>
@@ -30,25 +34,28 @@ foreach($efforts as $effort)
-
-
-
- user->account);?>
-
+ | task->teamOrder;?> |
task->date;?> |
task->recordedBy;?> |
- comment;?> |
+ task->work;?> |
task->consumed;?> |
task->left;?> |
actions;?> |
+ $count):?>
+
+ account != $this->app->user->account) continue;?>
+
+ |
+
+
date;?> |
account);?> |
work;?> |
@@ -63,31 +70,33 @@ foreach($efforts as $effort)
+
-
- $accounts):?>
-
-
-
-
+ | task->teamOrder;?> |
task->date;?> |
task->recordedBy;?> |
- comment;?> |
+ task->work;?> |
task->consumed;?> |
task->left;?> |
actions;?> |
+ $accounts):?>
+
+
+ |
+
+
date;?> |
account);?> |
work;?> |
@@ -102,9 +111,9 @@ foreach($efforts as $effort)
+
-
diff --git a/module/task/view/recordestimate.html.php b/module/task/view/recordestimate.html.php
index 5934918eaf..8f70f88c3c 100644
--- a/module/task/view/recordestimate.html.php
+++ b/module/task/view/recordestimate.html.php
@@ -74,10 +74,10 @@
- assignedTo != $app->user->account and $task->mode == 'linear'):?>
- task->deniedNotice, '' . $task->assignedToRealName . '', $lang->task->logEfforts);?>
- members[$app->user->account])):?>
+ members[$app->user->account])):?>
task->deniedNotice, '' . $lang->task->teamMember . '', $lang->task->logEfforts);?>
+ assignedTo != $app->user->account and $task->mode == 'linear'):?>
+ task->deniedNotice, '' . $task->assignedToRealName . '', $lang->task->logEfforts);?>
@@ -91,7 +91,7 @@
$readonly = ' readonly';
$left = 0;
$reverseOrders = array_reverse($myOrders, true);
- foreach($reverseOrders as $order) $reverseOrders[$order] = $order + 1;
+ foreach($reverseOrders as $order => $count) $reverseOrders[$order] = $order + 1;
}
?>
|