diff --git a/module/block/control.php b/module/block/control.php index b646575654..0aaf7ce82a 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1522,6 +1522,13 @@ class block extends control */ public function printScrumdynamicBlock() { - $this->view->program = $this->loadModel('project')->getByID($this->session->program); - } + $projects = $this->loadModel('project')->getPairs(); + $actions = $this->dao->select('*')->from(TABLE_ACTION) + ->where('project')->in(array_keys($projects)) + ->orderBy('id_desc') + ->fetchAll(); + + $this->view->actions = $this->loadModel('action')->transformActions($actions); + $this->view->users = $this->loadModel('user')->getPairs('noletter'); + } } diff --git a/module/block/model.php b/module/block/model.php index 703856cd5e..1aa789eba7 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -682,4 +682,5 @@ class blockModel extends model return json_encode($params); } + } diff --git a/module/block/view/scrumdynamicblock.html.php b/module/block/view/scrumdynamicblock.html.php index e69de29bb2..05b98b0f15 100644 --- a/module/block/view/scrumdynamicblock.html.php +++ b/module/block/view/scrumdynamicblock.html.php @@ -0,0 +1,25 @@ + +
block->emptyTip;?>
+ + +
+ +
+