diff --git a/db/update1.1.sql b/db/update1.1.sql index e99ce9677b..0ba115c612 100644 --- a/db/update1.1.sql +++ b/db/update1.1.sql @@ -1,55 +1,48 @@ --- doc -CREATE TABLE IF NOT EXISTS `zt_doc` ( - `id` mediumint(8) unsigned NOT NULL auto_increment, - `company` smallint(5) unsigned NOT NULL, - `product` mediumint(8) unsigned NOT NULL, - `project` mediumint(8) unsigned NOT NULL, - `lib` varchar(30) NOT NULL, - `module` varchar(30) NOT NULL, - `title` varchar(120) NOT NULL, - `digest` varchar(255) NOT NULL, - `type` varchar(30) NOT NULL, - `content` text NOT NULL, - `url` varchar(255) NOT NULL, - `views` smallint(5) unsigned NOT NULL, - `addedBy` varchar(30) NOT NULL, - `addedDate` datetime NOT NULL, - `editedBy` varchar(30) NOT NULL, - `editedDate` datetime NOT NULL, - `deleted` enum('0','1') NOT NULL default '0', - PRIMARY KEY (`id`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- doc lib -CREATE TABLE IF NOT EXISTS `zt_docLib` ( - `id` smallint(5) unsigned NOT NULL auto_increment, - `company` smallint(5) unsigned NOT NULL, - `name` varchar(60) NOT NULL, - `deleted` enum('0','1') NOT NULL DEFAULT '0', - PRIMARY KEY (`id`), - KEY `company` (`company`) - ) ENGINE=MyISAM DEFAULT CHARSET=utf8; --- module -ALTER TABLE `zt_module` CHANGE `product` `root` MEDIUMINT( 8 ) UNSIGNED NOT NULL DEFAULT '0'; -ALTER TABLE `zt_module` CHANGE `view` `type` CHAR( 30 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; -ALTER TABLE `zt_module` ADD `owner` VARCHAR( 30 ) NOT NULL ; -update zt_module set `type` = 'story' where `type` = 'product'; --- tpl -CREATE TABLE IF NOT EXISTS `zt_userTPL` ( - `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, - `company` mediumint(8) unsigned NOT NULL, - `account` char(30) NOT NULL, - `type` char(30) NOT NULL, - `title` varchar(150) NOT NULL, - `content` text NOT NULL, - PRIMARY KEY (`id`), - KEY `company` (`company`), - KEY `account` (`account`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; --- product acl -ALTER TABLE `zt_product` ADD `acl` ENUM( 'open', 'private', 'custom' ) NOT NULL DEFAULT 'open' AFTER `desc` , -ADD `whitelist` VARCHAR( 255 ) NOT NULL AFTER `acl` ; - --- product owner. -ALTER TABLE `zt_product` ADD `productOwner` VARCHAR( 30 ) NOT NULL AFTER `desc` , -ADD `bugOwner` VARCHAR( 30 ) NOT NULL AFTER `productOwner` ; +ALTER TABLE `zt_effort` ADD `consumed` FLOAT NOT NULL AFTER `date`; +INSERT INTO `zt_groupPriv` (`company`, `group`, `module`, `method`) VALUES +(1, 1, 'company', 'effort'), +(1, 2, 'company', 'effort'), +(1, 3, 'company', 'effort'), +(1, 4, 'company', 'effort'), +(1, 5, 'company', 'effort'), +(1, 1, 'effort', 'export'), +(1, 2, 'effort', 'export'), +(1, 3, 'effort', 'export'), +(1, 4, 'effort', 'export'), +(1, 5, 'effort', 'export'), +(1, 1, 'effort', 'view'), +(1, 2, 'effort', 'view'), +(1, 3, 'effort', 'view'), +(1, 4, 'effort', 'view'), +(1, 5, 'effort', 'view'), +(1, 1, 'effort', 'edit'), +(1, 2, 'effort', 'edit'), +(1, 3, 'effort', 'edit'), +(1, 4, 'effort', 'edit'), +(1, 5, 'effort', 'edit'), +(1, 1, 'effort', 'batchCreate'), +(1, 2, 'effort', 'batchCreate'), +(1, 3, 'effort', 'batchCreate'), +(1, 4, 'effort', 'batchCreate'), +(1, 5, 'effort', 'batchCreate'), +(1, 1, 'effort', 'delete'), +(1, 2, 'effort', 'delete'), +(1, 3, 'effort', 'delete'), +(1, 4, 'effort', 'delete'), +(1, 5, 'effort', 'delete'), +(1, 1, 'effort', 'createForObject'), +(1, 2, 'effort', 'createForObject'), +(1, 3, 'effort', 'createForObject'), +(1, 4, 'effort', 'createForObject'), +(1, 5, 'effort', 'createForObject'), +(1, 1, 'my', 'effort'), +(1, 2, 'my', 'effort'), +(1, 3, 'my', 'effort'), +(1, 4, 'my', 'effort'), +(1, 5, 'my', 'effort'), +(1, 1, 'project', 'effort'), +(1, 2, 'project', 'effort'), +(1, 3, 'project', 'effort'), +(1, 4, 'project', 'effort'), +(1, 5, 'project', 'effort'), +(1, 1, 'user', 'effort'); diff --git a/module/common/control.php b/module/common/control.php index e5bd8cd246..b0a11f1211 100644 --- a/module/common/control.php +++ b/module/common/control.php @@ -396,9 +396,8 @@ class common extends control public function getSysURL() { $httpType = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http'; - $httpPort = $_SERVER['SERVER_PORT'] == 80 ? '' : $_SERVER['SERVER_PORT']; $httpHost = $_SERVER['HTTP_HOST']; - return "$httpType://$httpHost:$httpPort"; + return "$httpType://$httpHost"; } /**