Merge branch 'sprint/215_liumengyi_25230' into 'master'

* Fix bug #25230, #25200,#24929.

See merge request easycorp/zentaopms!4579

module/project/model.php

@@ -639,6 +639,10 @@ class projectModel extends model
             {
                 $link = helper::createLink($module, $method, "projectID=%s");
             }
+            elseif($module == 'programplan')
+            {
+                $link = helper::createLink('project', 'execution', "type=all&projectID=%s");
+            }
         }
 
         return $link;

module/task/js/create.js

@@ -303,7 +303,7 @@ function setLane(regionID)
 /* Get select of stories.*/
 function setStories(moduleID, executionID)
 {
-    link = createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=all&moduleID=' + moduleID + '&storyID=0&number=&type=full&status=unclosed');
+    link = createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=all&moduleID=' + moduleID + '&storyID=0&number=&type=full&status=active');
     $.get(link, function(stories)
     {
         var storyID = $('#story').val();

module/task/model.php

@@ -1804,6 +1804,8 @@ class taskModel extends model
             $data->assignedDate = $now;
             $data->finishedBy   = $this->app->user->account;
             $data->finishedDate = $now;
+
+            $this->action->create('task', $taskID, 'Finished');
         }
         elseif($task->status == 'wait')
         {