diff --git a/module/projectstory/control.php b/module/projectstory/control.php index 90525d86e1..1d36bd35d1 100644 --- a/module/projectstory/control.php +++ b/module/projectstory/control.php @@ -41,8 +41,16 @@ class projectStory extends control { if($from == 'doc') { - $projects = $this->loadModel('project')->getPairs(); - if(!$projectID) $projectID = key($projects); + if(!$projectID) + { + $projects = $this->loadModel('project')->getPairs(); + + $projectProducts = $this->dao->select('project, count(1) as productCount')->from(TABLE_PROJECTPRODUCT) + ->where('project')->in(array_keys($projects)) + ->groupBy('project') + ->fetchPairs(); + if(!empty($projectProducts)) $projectID = current($projectProducts); + } } /* Get productID for none-product project. */ diff --git a/module/projectstory/ui/story.html.php b/module/projectstory/ui/story.html.php index 8902f6332f..52c876c07d 100644 --- a/module/projectstory/ui/story.html.php +++ b/module/projectstory/ui/story.html.php @@ -89,7 +89,7 @@ $setting['title']['nestedtoggle'] = false; if(isset($setting['actions'])) unset($setting['actions']); foreach($setting as $key => $col) { - $setting[$key]['sorttype'] = false; + $setting[$key]['sortType'] = false; if(isset($col['link'])) unset($setting[$key]['link']); }