diff --git a/db/update17.6.2.sql b/db/update17.6.2.sql index 0d691d04d1..601887adc3 100644 --- a/db/update17.6.2.sql +++ b/db/update17.6.2.sql @@ -1,6 +1,6 @@ -ALTER TABLE `zt_kanban` ADD `colWidth` smallint(4) NOT NULL DEFAULT '0' AFTER `fluidBoard`; -ALTER TABLE `zt_kanban` ADD `minColWidth` smallint(4) NOT NULL DEFAULT '0' AFTER `colWidth`; -ALTER TABLE `zt_kanban` ADD `maxColWidth` smallint(4) NOT NULL DEFAULT '0' AFTER `minColWidth`; -ALTER TABLE `zt_project` ADD `colWidth` smallint(4) NOT NULL DEFAULT '0' AFTER `fluidBoard`; -ALTER TABLE `zt_project` ADD `minColWidth` smallint(4) NOT NULL DEFAULT '0' AFTER `colWidth`; -ALTER TABLE `zt_project` ADD `maxColWidth` smallint(4) NOT NULL DEFAULT '0' AFTER `minColWidth`; \ No newline at end of file +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/module/kanban/model.php b/module/kanban/model.php index cda2e75b24..ae382c2ecc 100755 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -2356,7 +2356,10 @@ class kanbanModel extends model $this->dao->update(TABLE_KANBAN)->data($kanban) ->autoCheck() ->batchCheck($this->config->kanban->edit->requiredFields, 'notempty') - ->checkIF($kanban->fluidBoard , 'maxColWidth', 'ge', $kanban->minColWidth) + ->batchCheck('colWidth,minColWidth,maxColWidth', 'int') + ->checkIF(!$kanban->fluidBoard, 'colWidth', 'gt', 0) + ->batchCheckIF($kanban->fluidBoard, 'minColWidth,maxColWidth', 'gt', 0) + ->checkIF($kanban->fluidBoard, 'maxColWidth', 'ge', $kanban->minColWidth) ->where('id')->eq($kanbanID) ->exec();