Merge branch 'master' of https://git.zcorp.cc/zentaopms

module/program/model.php

@@ -1138,7 +1138,7 @@ class programModel extends model
      * 
      * @param  int    $projectID 
      * @access public
-     * @return void
+     * @return object 
      */
     public function getPRJWorkhour($projectID)
     {
@@ -1174,7 +1174,7 @@ class programModel extends model
      * 
      * @param  int    $projectID 
      * @access public
-     * @return void
+     * @return object 
      */
     public function getPRJStatData($projectID)
     {

module/program/view/prjview.html.php

@@ -103,7 +103,7 @@
             echo $this->buildOperateMenu($project, 'view');
 
             echo "<div class='divider'></div>";
-            common::printIcon('program', 'PRJEdit', $params . "programID=$project->parent", $project, 'button', 'edit', '', '', '', '', $lang->edit);
+            common::printIcon('program', 'PRJEdit', $params . "&programID=$project->parent", $project, 'button', 'edit', '', '', '', '', $lang->edit);
             common::printIcon('program', 'PRJDelete', $params, $project, 'button', 'trash', 'hiddenwin', '', '', '', $lang->delete);
         }
         ?>