Merge branch 'sprint/187_tianshujie_20594' into 'master'

* Fix bug #20594.

See merge request easycorp/zentaopms!2209

module/project/model.php

@@ -672,11 +672,12 @@ class projectModel extends model
 
         $projects = $this->dao->select('id, name, path')->from(TABLE_PROJECT)
             ->where('type')->eq('project')
+            ->andWhere('deleted')->eq('0')
+            ->andWhere('vision')->eq($this->config->vision)
             ->beginIF($programID)->andWhere('parent')->eq($programID)->fi()
             ->beginIF($this->config->vision)->andWhere('vision')->eq($this->config->vision)->fi()
             ->beginIF($model != 'all')->andWhere('model')->eq($model)->fi()
             ->beginIF(strpos($param, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
-            ->andWhere('deleted')->eq('0')
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
             ->orderBy('id_desc')
             ->fetchAll();

module/score/control.php

@@ -31,6 +31,8 @@ class score extends control
      */
     public function rule()
     {
+        $this->app->loadLang('my');
+
         $this->view->title      = $this->lang->my->scoreRule;
         $this->view->position[] = $this->lang->my->scoreRule;
         $this->display();

module/task/js/common.js

@@ -0,0 +1,22 @@
+/* Set the story module. */
+function setStoryModule()
+{
+    var storyID = $('#story').val();
+    if(storyID)
+    {
+        var link = createLink('story', 'ajaxGetInfo', 'storyID=' + storyID);
+        $.getJSON(link, function(storyInfo)
+        {
+            if(storyInfo)
+            {
+                $('#module').val(storyInfo.moduleID);
+                $("#module").trigger("chosen:updated");
+
+                $('#storyEstimate').val(storyInfo.estimate);
+                $('#storyPri').val(storyInfo.pri);
+                $('#storyDesc').val(storyInfo.spec);
+            }
+        });
+    }
+}
+

module/task/js/create.js

@@ -169,28 +169,6 @@ function setStoryRelated()
     setStoryModule();
 }
 
-/* Set the story module. */
-function setStoryModule()
-{
-    var storyID = $('#story').val();
-    if(storyID)
-    {
-        var link = createLink('story', 'ajaxGetInfo', 'storyID=' + storyID);
-        $.getJSON(link, function(storyInfo)
-        {
-            if(storyInfo)
-            {
-                $('#module').val(storyInfo.moduleID);
-                $("#module").trigger("chosen:updated");
-
-                $('#storyEstimate').val(storyInfo.estimate);
-                $('#storyPri'     ).val(storyInfo.pri);
-                $('#storyDesc'    ).val(storyInfo.spec);
-            }
-        });
-    }
-}
-
 /* Set the story priview link. */
 function setPreview()
 {