Merge branch '20.x' of github.com:easysoft/zentaopms into 20.x

2020-08-20 15:56:55 +08:00
parent 09cfff0dbc c82fc3ff60
commit 90b6f05859
91 changed files with 3997 additions and 975 deletions
@@ -18,13 +18,14 @@ class program extends control
     */
    public function index($programID = 0)
    {
+        $this->lang->navGroup->program = 'program';
        if(!$programID) $programID = $this->session->program;
        $this->session->set('program', $programID);
-        $this->lang->navGroup->program = 'program';

        $this->view->title      = $this->lang->program->common . $this->lang->colon . $this->lang->program->index;
        $this->view->position[] = $this->lang->program->index;
        $this->view->program    = $this->project->getByID($programID);
+
        $this->display();
    }

@@ -697,6 +698,7 @@ class program extends control
        $this->view->module    = $module;
        $this->view->method    = $method;
        $this->view->extra     = $extra;
+
        $programs = $this->dao->select('*')->from(TABLE_PROJECT)->where('id')->in(array_keys($this->programs))->orderBy('order desc')->fetchAll();
        $programPairs = array();    
        foreach($programs as $program) $programPairs[$program->id] = $program->name;