Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #15460,17587.

Browse Source
This commit is contained in:
tianshujie
2022-04-02 10:13:13 +08:00
parent d993fe3734
commit a1eb251907
5 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/design/control.php
+4 -3
View File
@@ -308,8 +308,6 @@ class design extends control
$repos = $this->loadModel('repo')->getRepoPairs('project', $design->project);
$repoID = $repoID ? $repoID : key($repos);
if(empty($repoID)) return print(js::locate(helper::createLink('repo', 'create', "objectID=$design->project")));
$repo = $this->loadModel('repo')->getRepoByID($repoID);
$revisions = $this->repo->getCommits($repo, '', 'HEAD', '', '', $begin, $end);
@@ -399,12 +397,15 @@ class design extends control
$this->app->loadClass('pager', $static = true);
$pager = pager::init(0, $recPerPage, $pageID);
$design = $this->design->getCommit($designID, $pager);
$this->view->title = $this->lang->design->common . $this->lang->colon . $this->lang->design->submission;
$this->view->position[] = $this->lang->design->submission;
$this->view->design = $this->design->getCommit($designID, $pager);
$this->view->design = $design;
$this->view->pager = $pager;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->repos = $this->loadModel('repo')->getRepoPairs('project', $design->project);
$this->display();
}