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

Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
holan20180123
2021-07-27 11:33:59 +08:00
parent 32853c2943 55731a6c50
commit 3293dea3c0
22 changed files with 406 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/bugs.php
+1 -1
View File
@@ -11,7 +11,7 @@ class bugsEntry extends entry
public function get($productID)
{
$control = $this->loadController('bug', 'browse');
$control->browse($productID);
$control->browse($productID, $this->param('branch', ''), $this->param('status', ''), 0, $this->param('order', ''), 0, $this->param('limit', 20), $this->param('page', 1));
$data = $this->getData();
if(isset($data->status) and $data->status == 'success')
api/v1/entries/executions.php
+1 -1
View File
@@ -11,7 +11,7 @@ class executionsEntry extends entry
public function get($projectID = 0)
{
$control = $this->loadController('execution', 'all');
$control->all($this->param('status', 'all'), $this->param('project', $projectID));
$control->all($this->param('status', 'all'), $this->param('project', $projectID), $this->param('order', 'id_desc'), 0, $this->param('total', 0), $this->param('limit', 20), $this->param('page', 1));
$data = $this->getData();
if(isset($data->status) and $data->status == 'success')
api/v1/entries/productissue.php
+101
View File
@@ -0,0 +1,101 @@
<?php
/**
* 禅道API的product issues资源类
* 版本V1
* 目前适用于Gitlab
*
* The product issues entry point of zentaopms
* Version 1
*/
class productIssueEntry extends entry
{
public function get($issueID)
{
$idParams = explode('-', $issueID);
if(count($idParams) < 2) $this->sendError(400, 'The id of issue is wrong.');
$type = $idParams[0];
$id = $idParams[1];
$issue = new stdclass();
switch($type)
{
case 'story':
$this->app->loadLang('story');
$storyStatus = array('' => '', 'draft' => 'wait', 'active' => 'active', 'changed' => 'active', 'closed' => 'closed');
$story = $this->dao->select('*')->from(TABLE_STORY)->where('id')->eq($id)->fetch();
$issue->id = $issueID;
$issue->title = $story->title;
$issue->labels = array($this->app->lang->story->common, zget($this->app->lang->story->categoryList, $story->category));
$issue->pri = $story->pri;
$issue->assignedTo = $story->assignedTo;
$issue->openedDate = $story->openedDate;
$issue->openedBy = $story->openedBy;
$issue->lastEditedDate = $story->lastEditedDate;
$issue->status = $storyStatus[$story->status];
$issue->url = $this->createLink('story', 'view', "storyID=$id");
$storySpec = $this->dao->select('*')->from(TABLE_STORYSPEC)->where('story')->eq($id)->andWhere('version')->eq($story->version)->fetch();
$issue->desc = $storySpec->spec;
break;
case 'bug':
$this->app->loadLang('bug');
$bugStatus = array('' => '', 'active' => 'active', 'resolved' => 'done', 'closed' => 'closed');
$bug = $this->dao->select('*')->from(TABLE_BUG)->where('id')->eq($id)->fetch();
$issue->id = $issueID;
$issue->title = $bug->title;
$issue->labels = array($this->app->lang->bug->common, zget($this->app->lang->bug->typeList, $bug->type));
$issue->pri = $bug->pri;
$issue->assignedTo = $bug->assignedTo;
$issue->openedDate = $bug->openedDate;
$issue->openedBy = $bug->openedBy;
$issue->lastEditedDate = $bug->lastEditedDate;
$issue->status = $bugStatus[$bug->status];
$issue->url = $this->createLink('bug', 'view', "bugID=$id");
$issue->desc = $bug->steps;
break;
case 'task':
$this->app->loadLang('task');
$taskStatus = array('' => '', 'wait' => 'wait', 'doing' => 'active', 'done' => 'done', 'pause' => 'pause', 'cancel' => 'cancel', 'closed' => 'closed');
$task = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($id)->fetch();
$issue->id = $issueID;
$issue->title = $task->name;
$issue->labels = array($this->app->lang->task->common, zget($this->app->lang->task->typeList, $task->type));
$issue->pri = $task->pri;
$issue->assignedTo = $task->assignedTo;
$issue->openedDate = $task->openedDate;
$issue->openedBy = $task->openedBy;
$issue->lastEditedDate = $task->lastEditedDate;
$issue->status = $taskStatus[$task->status];
$issue->url = $this->createLink('task', 'view', "taskID=$id");
$issue->desc = $task->desc;
break;
}
$this->send(200, array('issue' => $this->format($issue, 'openedDate:time,lastEditedDate:time')));
}
/**
* Create url of issue.
*
* @param string $module
* @param string $method
* @param string $vars
* @access private
* @return string
*/
private function createLink($module, $method, $vars)
{
$link = helper::createLink($module, $method, $vars, 'html');
if($this->config->requestType == 'GET')
{
$pos = strpos($link, '.php');
$link = '/index' . substr($link, $pos);
}
return common::getSysURL() . $link;
}
}
api/v1/entries/productissues.php
+193
View File
@@ -0,0 +1,193 @@
<?php
/**
* 禅道API的project issues资源类
* 版本V1
* 目前适用于Gitlab
*
* The product issues entry point of zentaopms
* Version 1
*/
class productIssuesEntry extends entry
{
public function get($productID)
{
$taskFields = 'id,status';
$taskStatus = array('' => '');
$taskStatus['wait'] = 'wait';
$taskStatus['active'] = 'doing';
$taskStatus['done'] = 'done';
$taskStatus['pause'] = 'pause';
$taskStatus['cancel'] = 'cancel';
$taskStatus['closed'] = 'closed';
$storyFields = 'id,status';
$storyStatus = array('' => '');
$storyStatus['wait'] = 'draft';
$storyStatus['active'] = 'active,changed';
$storyStatus['closed'] = 'closed';
$bugFields = 'id,status';
$bugStatus = array('' => '');
$bugStatus['active'] = 'active';
$bugStatus['done'] = 'resolved';
$bugStatus['closed'] = 'closed';
$productID = (int)$productID;
$status = $this->param('status', '');
$label = $this->param('label', '');
$search = $this->param('search', '');
$page = $this->param('page', 0);
$limit = $this->param('limit', 20);
$order = $this->param('order', 'openedDate_desc');
$orderParams = explode('_', $order);
$order = $orderParams[0];
$sort = (isset($orderParams[1]) and strtolower($orderParams[1]) == 'desc') ? 'desc' : 'asc';
switch($order)
{
case 'title':
$taskFields .= ',name as title';
$storyFields .= ',title';
$bugFields .= ',title';
default:
$taskFields .= ',openedDate';
$storyFields .= ',openedDate';
$bugFields .= ',openedDate';
}
$issues = array();
$tasks = $this->dao->select($taskFields)->from(TABLE_TASK)->where('project')->in('(SELECT project FROM ' . TABLE_PROJECTPRODUCT . " WHERE product = $productID)")
->beginIF($search)->andWhere('name')->like("%$search%")->fi()
->beginIF($status)->andWhere('status')->in($taskStatus[$status])->fi()
->andWhere('deleted')->eq(0)
->fetchAll();
foreach($tasks as $task) $issues[] = array('id' => $task->id, 'type' => 'task', 'order' => $task->$order, 'status' => $this->getKey($task->status, $taskStatus));
$stories = $this->dao->select($storyFields)->from(TABLE_STORY)->where('product')->eq($productID)
->beginIF($search)->andWhere('title')->like("%$search%")->fi()
->beginIF($status)->andWhere('status')->in($storyStatus[$status])->fi()
->andWhere('deleted')->eq(0)
->fetchAll();
foreach($stories as $story)
{
$issues[] = array('id' => $story->id, 'type' => 'story', 'order' => $story->$order, 'status' => $this->getKey($story->status, $storyStatus));
}
$bugs = $this->dao->select($bugFields)->from(TABLE_BUG)->where('product')->eq($productID)
->beginIF($search)->andWhere('title')->like("%$search%")->fi()
->beginIF($status)->andWhere('status')->in($bugStatus[$status])->fi()
->andWhere('deleted')->eq(0)
->fetchAll();
foreach($bugs as $bug)
{
$issues[] = array('id' => $bug->id, 'type' => 'bug', 'order' => $bug->$order, 'status' => $this->getKey($bug->status, $bugStatus));
}
array_multisort(array_column($issues, 'order'), $sort == 'asc' ? SORT_ASC : SORT_DESC, $issues);
$issues = array_slice($issues, $page * $limit, $limit);
$result = $this->processIssues($issues);
$this->send(200, array('page' => $page, 'total' => count($issues),'limit' => $limit, 'issues' => $result));
}
/**
* Process issues, format fields.
*
* @param array $issues
* @param int $page
* @param int $limit
* @access public
* @return array
*/
public function processIssues($issues)
{
$this->app->loadLang('task');
$this->app->loadLang('story');
$this->app->loadLang('bug');
$tasks = array();
$stories = array();
$bugs = array();
foreach($issues as $issue)
{
if($issue['type'] == 'story') $stories[] = $issue['id'];
if($issue['type'] == 'task') $tasks[] = $issue['id'];
if($issue['type'] == 'bug') $bugs[] = $issue['id'];
}
if(!empty($tasks)) $tasks = $this->dao->select('*')->from(TABLE_TASK)->where('id')->in($tasks)->fetchAll('id');
if(!empty($stories)) $stories = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($stories)->fetchAll('id');
if(!empty($bugs)) $bugs = $this->dao->select('*')->from(TABLE_STORY)->where('id')->in($bugs)->fetchAll('id');
$result = array();
foreach($issues as $issue)
{
$r = new stdclass();
if($issue['type'] == 'task')
{
$task = $tasks[$issue['id']];
$r->id = 'task-' . $task->id;
$r->title = $task->name;
$r->labels = array($this->app->lang->task->common, zget($this->app->lang->task->typeList, $task->type));
$r->pri = $task->pri;
$r->assignedTo = $task->assignedTo;
$r->openedDate = $task->openedDate;
$r->openedBy = $task->openedBy;
$r->lastEditedDate = $task->lastEditedDate;
$r->status = $task->status;
}
else if($issue['type'] == 'story')
{
$story = $stories[$issue['id']];
$r->id = 'story-' . $story->id;
$r->title = $story->title;
$r->labels = array($this->app->lang->story->common, zget($this->app->lang->story->categoryList, $story->category));
$r->pri = $story->pri;
$r->assignedTo = $story->assignedTo;
$r->openedDate = $story->openedDate;
$r->openedBy = $story->openedBy;
$r->lastEditedDate = $story->lastEditedDate;
$r->status = $story->status;
}
else if($issue['type'] == 'bug')
{
$bug = $bugs[$issue['id']];
$r->id = 'bug-' . $bug->id;
$r->title = $bug->title;
$r->labels = array($this->app->lang->bug->common, zget($this->app->lang->bug->typeList, $bug->type));
$r->pri = $bug->pri;
$r->assignedTo = $bug->assignedTo;
$r->openedDate = $bug->openedDate;
$r->openedBy = $bug->openedBy;
$r->lastEditedDate = $bug->lastEditedDate;
$r->status = $bug->status;
}
$result[] = $this->format($r, 'openedDate:time,lastEditedDate:time');
}
return $result;
}
/**
* Get key in array by value.
*
* @param string $value
* @param array $array
* @access private
* @return string
*/
private function getKey($value, $array)
{
foreach($array as $key => $values)
{
if($values and strpos($value, $values) !== FALSE) return $key;
}
return '';
}
}
api/v1/entries/programs.php
+1 -1
View File
@@ -11,7 +11,7 @@ class ProgramsEntry extends Entry
public function get()
{
$program = $this->loadController('program', 'browse');
$program->browse();
$program->browse($this->param('status', 'all'), $this->param('order', 'order_asc'));
$data = $this->getData();
if(isset($data->status) and $data->status == 'success')
api/v1/entries/projects.php
+3 -3
View File
@@ -11,18 +11,18 @@ class projectsEntry extends entry
public function get()
{
$control = $this->loadController('project', 'browse');
$control->browse();
$control->browse(0, $this->param('status', 'all'), 0, $this->param('order', 'order_asc'), 0, $this->param('limit', 20), $this->param('page', 1));
$data = $this->getData();
if(isset($data->status) and $data->status == 'success')
{
$pager = $data->data->pager;
$pager = $data->data->pager;
$result = array();
foreach($data->data->projectStats as $project)
{
$result[] = $this->format($project, 'openedDate:time,lastEditedDate:time,closedDate:time,canceledDate:time');
}
return $this->send(200, array('page' => $pager->pageID, 'total' => $pager->recTotal, 'limit' => $pager->recPerPage, 'projects' => $result));
return $this->send(200, array('page' => $pager->pageID, 'total' => $pager->recTotal, 'limit' => (int)$pager->recPerPage, 'projects' => $result));
}
if(isset($data->status) and $data->status == 'fail')
api/v1/entries/stories.php
+1 -1
View File
@@ -11,7 +11,7 @@ class storiesEntry extends entry
public function get($productID)
{
$control = $this->loadController('product', 'browse');
$control->browse($productID);
$control->browse($productID, $this->param('branch', 0), $this->param('type', ''), 0, 'story', $this->param('order', ''), $this->param('total', 0), $this->param('limit', 20), $this->param('page', 1));
$data = $this->getData();
if(isset($data->status) and $data->status == 'success')
api/v1/entries/tasks.php
+1 -1
View File
@@ -11,7 +11,7 @@ class tasksEntry extends entry
public function get($executionID)
{
$control = $this->loadController('execution', 'task');
$control->task($executionID, 'all');
$control->task($executionID, $this->param('status', 'all'), 0, $this->param('order', ''), $this->param('total', 0), $this->param('limit', 100), $this->param('page', 1));
$data = $this->getData();
if(isset($data->status) and $data->status == 'success')
config/routes.php
+3
View File
@@ -38,4 +38,7 @@ $routes['/user'] = 'user';
$routes['/programs'] = 'programs';
$routes['/programs/:id'] = 'program';
$routes['/issues/:issueID'] = 'productIssue';
$routes['/products/:productID/issues'] = 'productIssues';
$config->routes = $routes;
db/update15.2.sql
+3
View File
@@ -3,3 +3,6 @@ ADD `engine` varchar(20) NOT NULL AFTER `frame`,
CHANGE `jkHost` `server` mediumint(0) UNSIGNED NOT NULL AFTER `frame`,
CHANGE `jkJob` `pipeline` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `server`;
UPDATE zt_cron SET `remark` = '执行DevOps构建任务' WHERE `remark` = '执行Jenkins任务';
UPDATE zt_cron SET `remark` = '同步DevOps构建任务状态' WHERE `remark` = '同步Jenkins任务状态';
db/zentao.sql
+2 -2
View File
@@ -1325,8 +1325,8 @@ INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type
('*/5', '*', '*', '*', '*', 'moduleName=admin&methodName=deleteLog', '删除过期日志', 'zentao', 1, 'normal', '0000-00-00 00:00:00'),
('1', '1', '*', '*', '*', 'moduleName=todo&methodName=createCycle', '生成周期性待办', 'zentao', 1, 'normal', '0000-00-00 00:00:00'),
('1', '0', '*', '*', '*', 'moduleName=ci&methodName=initQueue', '创建周期性任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'),
('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkCompileStatus', '同步Jenkins任务状态', 'zentao', 1, 'normal', '0000-00-00 00:00:00'),
('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=exec', '执行Jenkins任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00');
('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkCompileStatus', '同步DevOps构建任务状态', 'zentao', 1, 'normal', '0000-00-00 00:00:00'),
('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=exec', '执行DevOps构建任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00');
INSERT INTO `zt_group` (`id`, `name`, `role`, `desc`) VALUES
(1, 'ADMIN', 'admin', 'for administrator'),
framework/api/entry.class.php
+6 -4
View File
@@ -10,6 +10,8 @@ class entry extends baseEntry
parent::__construct();
if(!isset($this->app->user)) $this->sendError(401, 'Unauthorized');
$this->dao = $this->loadModel('common')->dao;
}
}
@@ -47,8 +49,9 @@ class baseEntry
*/
public function __construct()
{
global $app;
$this->app = $app;
global $app, $config;
$this->app = $app;
$this->config = $config;
$this->parseRequestBody();
}
@@ -476,9 +479,8 @@ class baseEntry
return gmdate("Y-m-d\TH:i:s\Z", strtotime($value));
}
return $value;
case 'int':
case 'bool':
return $value;
return boolval($value) ? true : false;
default:
return $value;
}
framework/base/router.class.php
+12 -13
View File
@@ -849,23 +849,22 @@ class baseRouter
*/
public function startSession()
{
if(!defined('SESSION_STARTED'))
{
/* If request header has token, use it as session for authentication. */
if(isset($_SERVER['HTTP_TOKEN'])) session_id($_SERVER['HTTP_TOKEN']);
if(defined('SESSION_STARTED')) return;
$sessionName = $this->config->sessionVar;
session_name($sessionName);
session_set_cookie_params(0, $this->config->webRoot, '', $this->config->cookieSecure, true);
if($this->config->customSession) session_save_path($this->getTmpRoot() . 'session');
session_start();
/* If request header has token, use it as session for authentication. */
if(isset($_SERVER['HTTP_TOKEN'])) session_id($_SERVER['HTTP_TOKEN']);
$this->sessionID = session_id();
$sessionName = $this->config->sessionVar;
session_name($sessionName);
session_set_cookie_params(0, $this->config->webRoot, '', $this->config->cookieSecure, true);
if($this->config->customSession) session_save_path($this->getTmpRoot() . 'session');
session_start();
if(isset($_GET[$this->config->sessionVar])) helper::restartSession($_GET[$this->config->sessionVar]);
$this->sessionID = session_id();
define('SESSION_STARTED', true);
}
if(isset($_GET[$this->config->sessionVar])) helper::restartSession($_GET[$this->config->sessionVar]);
define('SESSION_STARTED', true);
}
/**
lib/base/pager/pager.class.php
+3 -3
View File
@@ -131,10 +131,10 @@ class basePager
$this->setModuleName();
$this->setMethodName();
$this->setRecTotal($recTotal);
$this->setRecPerPage($recPerPage);
$this->setRecTotal((int)$recTotal);
$this->setRecPerPage((int)$recPerPage);
$this->setPageTotal();
$this->setPageID($pageID);
$this->setPageID((int)$pageID);
}
/**
module/ci/model.php
+26 -9
View File
@@ -28,15 +28,15 @@ class ciModel extends model
*/
public function checkCompileStatus()
{
$compiles = $this->dao->select('t1.*, t2.pipeline, t3.name as jenkinsName,t3.url,t3.account,t3.token,t3.password')
->from(TABLE_COMPILE)->alias('t1')
->leftJoin(TABLE_JOB)->alias('t2')->on('t1.job=t2.id')
->leftJoin(TABLE_PIPELINE)->alias('t3')->on('t2.server=t3.id')
->where('t1.status')->ne('success')
->andWhere('t1.status')->ne('failure')
->andWhere('t1.status')->ne('create_fail')
->andWhere('t1.status')->ne('timeout')
->andWhere('t1.createdDate')->gt(date(DT_DATETIME1, strtotime("-1 day")))
$compiles = $this->dao->select('compile.*, job.engine,job.pipeline, pipeline.name as jenkinsName,job.server,pipeline.url,pipeline.account,pipeline.token,pipeline.password')
->from(TABLE_COMPILE)->alias('compile')
->leftJoin(TABLE_JOB)->alias('job')->on('compile.job=job.id')
->leftJoin(TABLE_PIPELINE)->alias('pipeline')->on('job.server=pipeline.id')
->where('compile.status')->ne('success')
->andWhere('compile.status')->ne('failure')
->andWhere('compile.status')->ne('create_fail')
->andWhere('compile.status')->ne('timeout')
->andWhere('compile.createdDate')->gt(date(DT_DATETIME1, strtotime("-1 day")))
->fetchAll();
foreach($compiles as $compile) $this->syncCompileStatus($compile);
@@ -57,6 +57,7 @@ class ciModel extends model
return false;
}
if($compile->engine == 'gitlab') return $this->syncGitlabTaskStatus($compile);
$jenkinsServer = $compile->url;
$jenkinsUser = $compile->account;
$jenkinsPassword = $compile->token ? $compile->token : base64_decode($compile->password);
@@ -112,6 +113,22 @@ class ciModel extends model
}
}
/**
* Sync gitlab task status.
*
* @param int $compile
* @access public
* @return bool
*/
public function syncGitlabTaskStatus($compile)
{
$now = helper::now();
$pipeline = $this->loadModel('gitlab')->apiGetSinglePipeline($compile->server, $compile->pipeline, $compile->queue);
$this->dao->update(TABLE_COMPILE)->set('status')->eq($pipeline->status)->set('updateDate')->eq($now)->where('id')->eq($compile->id)->exec();
$this->dao->update(TABLE_JOB)->set('lastExec')->eq($now)->set('lastStatus')->eq($pipeline->status)->where('id')->eq($compile->job)->exec();
return !dao::isError();
}
/**
* Update ci build status.
*
module/common/model.php
+29 -9
View File
@@ -2026,6 +2026,29 @@ EOD;
return $convertedItems;
}
/**
* Check an entry of new API.
*
* @access public
* @return void
*/
private function checkNewEntry()
{
$entry = $this->loadModel('entry')->getByKey(session_id());
if(!$entry or !$entry->account or !$this->checkIP($entry->ip)) return false;
$user = $this->dao->findByAccount($entry->account)->from(TABLE_USER)->andWhere('deleted')->eq(0)->fetch();
if(!$user) return false;
$user->last = time();
$user->rights = $this->loadModel('user')->authorize($user->account);
$user->groups = $this->user->getGroups($user->account);
$user->view = $this->user->grantUserView($user->account, $user->rights['acls']);
$user->admin = strpos($this->app->company->admins, ",{$user->account},") !== false;
$this->session->set('user', $user);
$this->app->user = $user;
}
/**
* Check an entry.
*
@@ -2034,20 +2057,17 @@ EOD;
*/
public function checkEntry()
{
if($this->isOpenMethod($_GET[$this->config->moduleVar], $_GET[$this->config->methodVar])) return true;
/* if the API is new version, goto checkNewEntry. */
if($this->app->version) return $this->checkNewEntry();
$this->loadModel('entry');
if($this->session->valid_entry)
{
if(!$this->session->entry_code) $this->response('SESSION_CODE_MISSING');
if($this->session->valid_entry != md5(md5($this->get->code) . $this->server->remote_addr)) $this->response('SESSION_VERIFY_FAILED');
return true;
}
/* Old version. */
if($this->isOpenMethod($_GET[$this->config->moduleVar], $_GET[$this->config->methodVar])) return true;
if(!$this->get->code) $this->response('PARAM_CODE_MISSING');
if(!$this->get->token) $this->response('PARAM_TOKEN_MISSING');
$entry = $this->entry->getByCode($this->get->code);
$entry = $this->loadModel('entry')->getByCode($this->get->code);
if(!$entry) $this->response('EMPTY_ENTRY');
if(!$entry->key) $this->response('EMPTY_KEY');
if(!$this->checkIP($entry->ip)) $this->response('IP_DENIED');
module/entry/model.php
+12
View File
@@ -35,6 +35,18 @@ class entryModel extends model
return $this->dao->select('*')->from(TABLE_ENTRY)->where('deleted')->eq('0')->andWhere('code')->eq($code)->fetch();
}
/**
* Get an entry by key.
*
* @param string $key
* @access public
* @return object
*/
public function getByKey($key)
{
return $this->dao->select('*')->from(TABLE_ENTRY)->where('deleted')->eq('0')->andWhere('`key`')->eq($key)->fetch();
}
/**
* Get entry list.
*
module/project/css/browse.css
+2 -1
View File
@@ -7,4 +7,5 @@ td.c-actions {overflow: visible;}
.c-actions .btn {overflow: visible;}
#programBox {float: left; margin-right: 10px;}
#switchButton {background: #fff !important;}
.panel-actions {position: relative; display: inline-block; vertical-align: middle; padding: 0 0;}
.panel-actions {position: relative; padding: 0 0;}
.icon-cards-view {padding-left: 7px;}
module/repo/control.php
+1
View File
@@ -442,6 +442,7 @@ class repo extends control
{
$infos = unserialize(file_get_contents($cacheFile));
}
if($this->cookie->repoRefresh) setcookie('repoRefresh', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, true);
/* Set logType and revisions. */
module/repo/model.php
+2 -1
View File
@@ -429,7 +429,7 @@ class repoModel extends model
public function getCommits($repo, $entry, $revision = 'HEAD', $type = 'dir', $pager = null, $begin = 0, $end = 0)
{
$entry = ltrim($entry, '/');
$entry = $repo->prefix . (empty($entry) ? '' : '/' . $entry);
if($repo->SCM != 'Gitlab') $entry = $repo->prefix . (empty($entry) ? '' : '/' . $entry);
$repoID = $repo->id;
$revisionTime = $this->dao->select('time')->from(TABLE_REPOHISTORY)->alias('t1')
@@ -442,6 +442,7 @@ class repoModel extends model
->fetch('time');
$historyIdList = array();
if($entry != '/' and !empty($entry))
{
$historyIdList = $this->dao->select('DISTINCT t2.id')->from(TABLE_REPOFILES)->alias('t1')
www/api.php
+2 -2
View File
@@ -34,11 +34,11 @@ $app = router::createApp('pms', dirname(dirname(__FILE__)), 'api');
$common = $app->loadCommon();
/* Check entry. */
if(!$app->version) $common->checkEntry();
$common->checkEntry();
$common->loadConfigFromDB();
/* Set default params. */
$config->requestType = 'GET';
if(!$app->version) $config->requestType = 'GET';
$config->default->view = 'json';
$app->parseRequest();
www/theme/blue/style.css
+1 -1
View File
File diff suppressed because one or more lines are too long