From 96876516339a4e0116bca7aaf5d267867fdd5778 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 31 Oct 2018 14:23:13 +0800
Subject: [PATCH]  * adjust for export word.

---
 module/project/view/kanban.html.php |  4 ++--
 module/task/control.php             | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/module/project/view/kanban.html.php b/module/project/view/kanban.html.php
index ee5823dd31..8a530afb40 100644
--- a/module/project/view/kanban.html.php
+++ b/module/project/view/kanban.html.php
@@ -14,8 +14,8 @@
     <?php echo html::a($this->createLink('project', 'ajaxKanbanSetting', "projectID=$projectID"), "<i class='icon-cog muted'></i> " . $lang->project->kanbanSetting, '', "class='iframe btn btn-link'");?>
     <?php if(common::hasPriv('project', 'printKanban')) echo html::a($this->createLink('project', 'printKanban', "projectID=$projectID"), "<i class='icon-printer muted'></i> " . $lang->project->printKanban, '', "class='iframe btn btn-link' id='printKanban' title='{$lang->project->printKanban}' data-width='500'");?>
     <?php
-    $link = $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=$browseType");
-    if(common::hasPriv('task', 'export')) echo html::a($link, "<i class='icon-import muted'></i> " . $lang->task->export, '', "class='btn btn-link iframe' data-width='700'");
+    $link = $this->createLink('task', 'export', "project=$projectID&orderBy=$orderBy&type=kanban");
+    if(common::hasPriv('task', 'export')) echo html::a($link, "<i class='icon-import muted'></i> " . $lang->task->export, '', "class='btn btn-link iframe export' data-width='700'");
     ?>
     <div class='btn-group'>
       <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'>
diff --git a/module/task/control.php b/module/task/control.php
index bf40410c65..7a0bdf356e 100644
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -1278,7 +1278,7 @@ class task extends control
                     $task->progress .= '%';
                 }
             }
-            else
+            elseif($this->session->taskQueryCondition)
             {
                 $stmt = $this->dbh->query($this->session->taskQueryCondition . ($this->post->exportType == 'selected' ? " AND t1.id IN({$this->cookie->checkedItem})" : '') . " ORDER BY " . strtr($orderBy, '_', ' '));
                 while($row = $stmt->fetch()) $tasks[$row->id] = $row;
@@ -1307,7 +1307,7 @@ class task extends control
             $relatedFiles   = $this->dao->select('id, objectID, pathname, title')->from(TABLE_FILE)->where('objectType')->eq('task')->andWhere('objectID')->in(@array_keys($tasks))->andWhere('extra')->ne('editor')->fetchGroup('objectID');
             $relatedModules = $this->loadModel('tree')->getTaskOptionMenu($projectID);
 
-            if(!$this->session->taskWithChildren)
+            if(!$this->session->taskWithChildren and $tasks)
             {
                 $children = $this->dao->select('*')->from(TABLE_TASK)->where('deleted')->eq(0)
                     ->andWhere('parent')->ne(0)
@@ -1359,8 +1359,14 @@ class task extends control
 
             if($type == 'group')
             {
+                $stories    = $this->loadModel('story')->getProjectStories($projectID);
                 $groupTasks = array();
-                foreach($tasks as $task) $groupTasks[$task->$orderBy][] = $task;
+                foreach($tasks as $task)
+                {
+                    $task->storyTitle = isset($stories[$task->story]) ? $stories[$task->story]->title : '';
+                    $groupTasks[$task->$orderBy][] = $task;
+                }
+
                 $tasks = array();
                 foreach($groupTasks as $groupTask)
                 {
@@ -1424,6 +1430,7 @@ class task extends control
 
         $this->view->allExportFields = $allExportFields;
         $this->view->customExport    = true;
+        $this->view->orderBy         = $orderBy;
         $this->view->type            = $type;
         $this->view->projectID       = $projectID;
         $this->display();