diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 42de4de738..fa4c5729d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,13 @@ stages: - - sonar - - unit_test - - uitest - - notify - - cleanup_packages + - sonarqube + - unit-test + - ui-test - package -sonarqube: - stage: sonar + - cleanup-packages + - notify + +program-static-analysis: + stage: sonarqube variables: SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar" # Defines the location of the analysis task cache GIT_DEPTH: "0" # Tells git to fetch all the branches of the project, required by the analysis task @@ -19,6 +20,25 @@ sonarqube: allow_failure: true only: - master # or the name of your main branch + +unit-test: + stage: unit-test + script: + - "/home/gitlab-runner/bin/zentao-unittest.sh ${CI_PROJECT_DIR}" + allow_failure: true + only: + - master + - merge_requests + +ui-test: + stage: ui-test + script: + - "/home/gitlab-runner/bin/zentao-uitest.sh ${CI_PROJECT_DIR}" + allow_failure: true + only: + - master + - merge_requests + package: stage: package script: @@ -26,22 +46,15 @@ package: allow_failure: true only: - master -unit_test: - stage: unit_test + +cleanup-packages: + stage: cleanup-packages script: - - "/home/gitlab-runner/bin/zentao-unittest.sh ${CI_PROJECT_DIR}" - allow_failure: true + - make clean + when: on_failure only: - master - - merge_requests -uitest: - stage: uitest - script: - - "/home/gitlab-runner/bin/zentao-uitest.sh ${CI_PROJECT_DIR}" - allow_failure: true - only: - - master - - merge_requests + notify: stage: notify script: @@ -49,9 +62,4 @@ notify: when: on_success only: - master - - merge_requests -cleanup_packages: - stage: cleanup_packages - script: - - make clean - when: on_failure + - merge_requests \ No newline at end of file diff --git a/api/v1/entries/releases.php b/api/v1/entries/releases.php index 5a451e1775..21167771cf 100644 --- a/api/v1/entries/releases.php +++ b/api/v1/entries/releases.php @@ -24,7 +24,7 @@ class releasesEntry extends entry if(empty($productID)) return $this->sendError(400, 'Need product id.'); $control = $this->loadController('release', 'browse'); - $control->browse($productID, $this->param('branch', 0), $this->param('status', 'all'), $this->param('order', 't1.date_desc')); + $control->browse($productID, $this->param('branch', 0), $this->param('status', 'all'), $this->param('order', 't1.date_desc'), 0, $this->param('limit', 20), $this->param('page', 1)); /* Response */ $data = $this->getData(); diff --git a/config/config.php b/config/config.php index f17bc0b372..dba114d322 100644 --- a/config/config.php +++ b/config/config.php @@ -97,6 +97,11 @@ $config->domainPostfix .= "|international|house|coffee|florist|rich|ceo|camp|edu $config->CSPs = array(); $config->CSPs[] = "form-action 'self';connect-src 'self'"; +/* Config for kanban col setting */ +$config->colWidth = 264; +$config->minColWidth = 180; +$config->maxColWidth = 384; + /* 系统框架配置。Framework settings. */ $config->framework = new stdclass(); $config->framework->autoConnectDB = true; // 是否自动连接数据库。 Whether auto connect database or not. diff --git a/db/update17.6.2.sql b/db/update17.6.2.sql new file mode 100644 index 0000000000..601887adc3 --- /dev/null +++ b/db/update17.6.2.sql @@ -0,0 +1,6 @@ +ALTER TABLE `zt_kanban` ADD `colWidth` smallint(4) NOT NULL DEFAULT '264' AFTER `fluidBoard`; +ALTER TABLE `zt_kanban` ADD `minColWidth` smallint(4) NOT NULL DEFAULT '180' AFTER `colWidth`; +ALTER TABLE `zt_kanban` ADD `maxColWidth` smallint(4) NOT NULL DEFAULT '384' AFTER `minColWidth`; +ALTER TABLE `zt_project` ADD `colWidth` smallint(4) NOT NULL DEFAULT '264' AFTER `fluidBoard`; +ALTER TABLE `zt_project` ADD `minColWidth` smallint(4) NOT NULL DEFAULT '180' AFTER `colWidth`; +ALTER TABLE `zt_project` ADD `maxColWidth` smallint(4) NOT NULL DEFAULT '384' AFTER `minColWidth`; diff --git a/db/zentao.sql b/db/zentao.sql index d5266fc5e3..1d7d846fa0 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -835,6 +835,9 @@ CREATE TABLE IF NOT EXISTS `zt_kanban` ( `displayCards` smallint(6) NOT NULL default '0', `showWIP` enum('0','1') NOT NULL DEFAULT '1', `fluidBoard` enum('0','1') NOT NULL DEFAULT '0', + `colWidth` tinyint(3) NOT NULL DEFAULT '0', + `minColWidth` tinyint(3) NOT NULL DEFAULT '0', + `maxColWidth` tinyint(3) NOT NULL DEFAULT '0', `object` varchar(255) NOT NULL, `alignment` varchar(10) NOT NULL default 'center', `createdBy` char(30) NOT NULL, @@ -1193,6 +1196,9 @@ CREATE TABLE IF NOT EXISTS `zt_project` ( `vision` varchar(10) NOT NULL DEFAULT 'rnd', `displayCards` smallint(6) NOT NULL default '0', `fluidBoard` enum('0','1') NOT NULL DEFAULT '0', + `colWidth` tinyint(3) NOT NULL DEFAULT '0', + `minColWidth` tinyint(3) NOT NULL DEFAULT '0', + `maxColWidth` tinyint(3) NOT NULL DEFAULT '0', `deleted` enum('0','1') NOT NULL DEFAULT '0', PRIMARY KEY (`id`), KEY `parent` (`parent`), diff --git a/extension/lite/my/ext/view/task.html.php b/extension/lite/my/ext/view/task.html.php index 01f53c561d..51885c6128 100644 --- a/extension/lite/my/ext/view/task.html.php +++ b/extension/lite/my/ext/view/task.html.php @@ -35,8 +35,15 @@