|
@@ -23,6 +23,9 @@ class Journal_v1 extends Core
|
|
|
|
|
|
public function getList()
|
|
|
{
|
|
|
+ if ($this->app) {
|
|
|
+ return $this->getAppList();
|
|
|
+ }
|
|
|
$data = array();
|
|
|
|
|
|
if ($data) {
|
|
@@ -43,11 +46,10 @@ class Journal_v1 extends Core
|
|
|
$this->data['push'] = Dever::db('journal/info')->getNew();
|
|
|
}
|
|
|
|
|
|
+ $this->data['push'] = $this->info($this->data['push']);
|
|
|
$this->data['button'] = array();
|
|
|
- if (!$this->app) {
|
|
|
- $this->data['push'] = $this->info($this->data['push']);
|
|
|
- $this->data['push'] = $this->getButton($this->data['push']);
|
|
|
- }
|
|
|
+ $this->data['push'] = $this->getButton($this->data['push']);
|
|
|
+
|
|
|
|
|
|
$data = Dever::db('journal/info')->getAllByPage($where);
|
|
|
|
|
@@ -124,7 +126,6 @@ class Journal_v1 extends Core
|
|
|
|
|
|
$this->data['button'] = array();
|
|
|
$this->data['push'] = $this->getButton($this->data['push']);
|
|
|
-
|
|
|
$this->data['push'] = $this->getAppSet($this->data['push']);
|
|
|
|
|
|
|