From 38b3d7e6fdb40a9f8e5de9140692b39722af9576 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 23 Jul 2018 15:06:49 +0800
Subject: [PATCH]  * fix bug #2068,2065,2064,2053.

---
 module/custom/model.php      | 4 +++-
 module/doc/css/createlib.css | 2 +-
 module/story/model.php       | 3 ++-
 module/task/control.php      | 2 +-
 module/testtask/js/create.js | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index 4d1f576faa..9663ae6ea5 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -484,6 +484,8 @@ class customModel extends model
             }
         }
 
-        $this->loadModel('setting')->setItems("system.{$moduleName}", $requiredFields);
+        $this->loadModel('setting');
+        $this->setting->deleteItems("owner=system&module={$moduleName}");
+        $this->setting->setItems("system.{$moduleName}", $requiredFields);
     }
 }
diff --git a/module/doc/css/createlib.css b/module/doc/css/createlib.css
index d5f518687f..a71c64e34e 100644
--- a/module/doc/css/createlib.css
+++ b/module/doc/css/createlib.css
@@ -1,3 +1,3 @@
-form {margin-right: 30px;}
+form {margin-right: 30px; margin-bottom:130px;}
 
 #whiteListBox div.input-group {margin-bottom: 2px;}
diff --git a/module/story/model.php b/module/story/model.php
index bbf8280118..1fa6c9689b 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -476,7 +476,8 @@ class storyModel extends model
         }
 
         $story = fixer::input('post')
-            ->cleanInt('product,module,pri,duplicateStory,estimate')
+            ->cleanInt('product,module,pri,duplicateStory')
+            ->cleanFloat('estimate')
             ->add('assignedDate', $oldStory->assignedDate)
             ->add('lastEditedBy', $this->app->user->account)
             ->add('lastEditedDate', $now)
diff --git a/module/task/control.php b/module/task/control.php
index ba8539f1cf..3a0da100d7 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1382,7 +1382,7 @@ class task extends control
                     $task->files = '';
                     foreach($relatedFiles[$task->id] as $file)
                     {
-                        $fileURL = common::getSysURL() . $this->file->webPath . $this->file->getRealPathName($file->pathname);
+                        $fileURL = common::getSysURL() . $this->createLink('file', 'download', "fileID={$file->id}");
                         $task->files .= html::a($fileURL, $file->title, '_blank') . '<br />';
                     }
                 }
diff --git a/module/testtask/js/create.js b/module/testtask/js/create.js
index 7987acb312..ae1a8ceb76 100755
--- a/module/testtask/js/create.js
+++ b/module/testtask/js/create.js
@@ -22,7 +22,7 @@ function loadProjectBuilds(projectID)
     selectedBuild = $('#build').val();
     if(!selectedBuild) selectedBuild = 0;
     link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + $('#product').val() + '&varName=testTaskBuild&build=' + selectedBuild);
-    $('#buildBox').load(link, function(){$('#build').chosen(window.);});
+    $('#buildBox').load(link, function(){$('#build').chosen();});
 }
 
 /**