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

Merge branch 'sprint/224_tianshujie_63687' into 'sprint/228'

Browse Source 
Sprint/224 tianshujie 63687

See merge request easycorp/zentaopms!4985
This commit is contained in:
王怡栋
2022-08-17 07:33:25 +00:00
parent 349686d619 64c7f8dc23
commit fe898f9e20
19 changed files with 512 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update17.5.sql
+249
View File
@@ -0,0 +1,249 @@
ALTER TABLE `zt_bug` MODIFY COLUMN `os` varchar(255) NOT NULL default '';
ALTER TABLE `zt_bug` MODIFY COLUMN `browser` varchar(255) NOT NULL default '';
INSERT INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`, `vision`) VALUES
('zh-cn', 'bug', 'browserList', 'all', '全部', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'chrome', 'Chrome', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'edge', 'Edge', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'ie', 'IE系列', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'ie11', 'IE11', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'ie10', 'IE10', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'ie9', 'IE9', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'ie8', 'IE8', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'ie7', 'IE7', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'ie6', 'IE6', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'firefox', 'firefox系列', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'firefox4', 'firefox4', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'firefox3', 'firefox3', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'firefox2', 'firefox2', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'opera', 'opera系列', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'opera11', 'opera11', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'opera10', 'opera10', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'opera9', 'opera9', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'safari', 'safari', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', '360', '360浏览器', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'qq', 'QQ浏览器', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'maxthon', '遨游', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'uc', 'UC', '1', 'rnd'),
('zh-cn', 'bug', 'browserList', 'other', '其他', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'all', '全部', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'chrome', 'Chrome', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'edge', 'Edge', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'ie', 'IE系列', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'ie11', 'IE11', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'ie10', 'IE10', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'ie9', 'IE9', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'ie8', 'IE8', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'ie7', 'IE7', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'ie6', 'IE6', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'firefox', 'firefox系列', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'firefox4', 'firefox4', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'firefox3', 'firefox3', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'firefox2', 'firefox2', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'opera', 'opera系列', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'opera11', 'opera11', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'opera10', 'opera10', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'opera9', 'opera9', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'safari', 'safari', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', '360', '360瀏覽器', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'qq', 'QQ瀏覽器', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'maxthon', '遨游', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'uc', 'UC', '1', 'rnd'),
('zh-tw', 'bug', 'browserList', 'other', '其他', '1', 'rnd'),
('en', 'bug', 'browserList', 'all', 'All', '1', 'rnd'),
('en', 'bug', 'browserList', 'chrome', 'Chrome', '1', 'rnd'),
('en', 'bug', 'browserList', 'edge', 'Edge', '1', 'rnd'),
('en', 'bug', 'browserList', 'ie', 'IE series', '1', 'rnd'),
('en', 'bug', 'browserList', 'ie11', 'IE11', '1', 'rnd'),
('en', 'bug', 'browserList', 'ie10', 'IE10', '1', 'rnd'),
('en', 'bug', 'browserList', 'ie9', 'IE9', '1', 'rnd'),
('en', 'bug', 'browserList', 'ie8', 'IE8', '1', 'rnd'),
('en', 'bug', 'browserList', 'ie7', 'IE7', '1', 'rnd'),
('en', 'bug', 'browserList', 'ie6', 'IE6', '1', 'rnd'),
('en', 'bug', 'browserList', 'firefox', 'Firefox series', '1', 'rnd'),
('en', 'bug', 'browserList', 'firefox4', 'Firefox4', '1', 'rnd'),
('en', 'bug', 'browserList', 'firefox3', 'Firefox3', '1', 'rnd'),
('en', 'bug', 'browserList', 'firefox2', 'Firefox2', '1', 'rnd'),
('en', 'bug', 'browserList', 'opera', 'Opera series', '1', 'rnd'),
('en', 'bug', 'browserList', 'opera11', 'Opera11', '1', 'rnd'),
('en', 'bug', 'browserList', 'opera10', 'Opera10', '1', 'rnd'),
('en', 'bug', 'browserList', 'opera9', 'Opera9', '1', 'rnd'),
('en', 'bug', 'browserList', 'safari', 'Safari', '1', 'rnd'),
('en', 'bug', 'browserList', '360', '360', '1', 'rnd'),
('en', 'bug', 'browserList', 'qq', 'QQ', '1', 'rnd'),
('en', 'bug', 'browserList', 'maxthon', 'Maxthon', '1', 'rnd'),
('en', 'bug', 'browserList', 'uc', 'UC', '1', 'rnd'),
('en', 'bug', 'browserList', 'other', 'Others', '1', 'rnd'),
('fr', 'bug', 'browserList', 'all', 'Tous', '1', 'rnd'),
('fr', 'bug', 'browserList', 'chrome', 'Chrome', '1', 'rnd'),
('fr', 'bug', 'browserList', 'edge', 'Edge', '1', 'rnd'),
('fr', 'bug', 'browserList', 'ie', 'IE series', '1', 'rnd'),
('fr', 'bug', 'browserList', 'ie11', 'IE11', '1', 'rnd'),
('fr', 'bug', 'browserList', 'ie10', 'IE10', '1', 'rnd'),
('fr', 'bug', 'browserList', 'ie9', 'IE9', '1', 'rnd'),
('fr', 'bug', 'browserList', 'ie8', 'IE8', '1', 'rnd'),
('fr', 'bug', 'browserList', 'ie7', 'IE7', '1', 'rnd'),
('fr', 'bug', 'browserList', 'ie6', 'IE6', '1', 'rnd'),
('fr', 'bug', 'browserList', 'firefox', 'Firefox series', '1', 'rnd'),
('fr', 'bug', 'browserList', 'firefox4', 'Firefox4', '1', 'rnd'),
('fr', 'bug', 'browserList', 'firefox3', 'Firefox3', '1', 'rnd'),
('fr', 'bug', 'browserList', 'firefox2', 'Firefox2', '1', 'rnd'),
('fr', 'bug', 'browserList', 'opera', 'Opera series', '1', 'rnd'),
('fr', 'bug', 'browserList', 'opera11', 'Opera11', '1', 'rnd'),
('fr', 'bug', 'browserList', 'opera10', 'Opera10', '1', 'rnd'),
('fr', 'bug', 'browserList', 'opera9', 'Opera9', '1', 'rnd'),
('fr', 'bug', 'browserList', 'safari', 'Safari', '1', 'rnd'),
('fr', 'bug', 'browserList', '360', '360', '1', 'rnd'),
('fr', 'bug', 'browserList', 'qq', 'QQ', '1', 'rnd'),
('fr', 'bug', 'browserList', 'maxthon', 'Maxthon', '1', 'rnd'),
('fr', 'bug', 'browserList', 'uc', 'UC', '1', 'rnd'),
('fr', 'bug', 'browserList', 'other', 'Autres', '1', 'rnd'),
('de', 'bug', 'browserList', 'all', 'Alle', '1', 'rnd'),
('de', 'bug', 'browserList', 'chrome', 'Chrome', '1', 'rnd'),
('de', 'bug', 'browserList', 'edge', 'Edge', '1', 'rnd'),
('de', 'bug', 'browserList', 'ie', 'IE series', '1', 'rnd'),
('de', 'bug', 'browserList', 'ie11', 'IE11', '1', 'rnd'),
('de', 'bug', 'browserList', 'ie10', 'IE10', '1', 'rnd'),
('de', 'bug', 'browserList', 'ie9', 'IE9', '1', 'rnd'),
('de', 'bug', 'browserList', 'ie8', 'IE8', '1', 'rnd'),
('de', 'bug', 'browserList', 'ie7', 'IE7', '1', 'rnd'),
('de', 'bug', 'browserList', 'ie6', 'IE6', '1', 'rnd'),
('de', 'bug', 'browserList', 'firefox', 'Firefox series', '1', 'rnd'),
('de', 'bug', 'browserList', 'firefox4', 'Firefox4', '1', 'rnd'),
('de', 'bug', 'browserList', 'firefox3', 'Firefox3', '1', 'rnd'),
('de', 'bug', 'browserList', 'firefox2', 'Firefox2', '1', 'rnd'),
('de', 'bug', 'browserList', 'opera', 'Opera series', '1', 'rnd'),
('de', 'bug', 'browserList', 'opera11', 'Opera11', '1', 'rnd'),
('de', 'bug', 'browserList', 'opera10', 'Opera10', '1', 'rnd'),
('de', 'bug', 'browserList', 'opera9', 'Opera9', '1', 'rnd'),
('de', 'bug', 'browserList', 'safari', 'Safari', '1', 'rnd'),
('de', 'bug', 'browserList', '360', '360', '1', 'rnd'),
('de', 'bug', 'browserList', 'qq', 'QQ', '1', 'rnd'),
('de', 'bug', 'browserList', 'maxthon', 'Maxthon', '1', 'rnd'),
('de', 'bug', 'browserList', 'uc', 'UC', '1', 'rnd'),
('de', 'bug', 'browserList', 'other', 'Andere', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'all', '全部', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'windows', 'Windows', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'win11', 'Windows 11', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'win10', 'Windows 10', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'win8', 'Windows 8', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'win7', 'Windows 7', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'winxp', 'Windows XP', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'osx', 'Mac OS', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'android', 'Android', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'ios', 'IOS', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'linux', 'Linux', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'ubuntu', 'Ubuntu', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'chromeos', 'Chrome OS', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'fedora', 'Fedora', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'vista', 'Windows Vista', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'win2012', 'Windows 2012', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'win2008', 'Windows 2008', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'win2003', 'Windows 2003', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'win2000', 'Windows 2000', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'wp8', 'WP8', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'wp7', 'WP7', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'symbian', 'Symbian', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'freebsd', 'FreeBSD', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'unix', 'Unix', '1', 'rnd'),
('zh-cn', 'bug', 'osList', 'others', '其他', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'all', '全部', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'windows', 'Windows', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'win11', 'Windows 11', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'win10', 'Windows 10', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'win8', 'Windows 8', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'win7', 'Windows 7', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'winxp', 'Windows XP', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'osx', 'Mac OS', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'android', 'Android', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'ios', 'IOS', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'linux', 'Linux', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'ubuntu', 'Ubuntu', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'chromeos', 'Chrome OS', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'fedora', 'Fedora', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'vista', 'Windows Vista', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'win2012', 'Windows 2012', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'win2008', 'Windows 2008', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'win2003', 'Windows 2003', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'win2000', 'Windows 2000', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'wp8', 'WP8', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'wp7', 'WP7', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'symbian', 'Symbian', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'freebsd', 'FreeBSD', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'unix', 'Unix', '1', 'rnd'),
('zh-tw', 'bug', 'osList', 'others', '其他', '1', 'rnd'),
('en', 'bug', 'osList', 'all', 'All', '1', 'rnd'),
('en', 'bug', 'osList', 'windows', 'Windows', '1', 'rnd'),
('en', 'bug', 'osList', 'win11', 'Windows 11', '1', 'rnd'),
('en', 'bug', 'osList', 'win10', 'Windows 10', '1', 'rnd'),
('en', 'bug', 'osList', 'win8', 'Windows 8', '1', 'rnd'),
('en', 'bug', 'osList', 'win7', 'Windows 7', '1', 'rnd'),
('en', 'bug', 'osList', 'winxp', 'Windows XP', '1', 'rnd'),
('en', 'bug', 'osList', 'osx', 'Mac OS', '1', 'rnd'),
('en', 'bug', 'osList', 'android', 'Android', '1', 'rnd'),
('en', 'bug', 'osList', 'ios', 'IOS', '1', 'rnd'),
('en', 'bug', 'osList', 'linux', 'Linux', '1', 'rnd'),
('en', 'bug', 'osList', 'ubuntu', 'Ubuntu', '1', 'rnd'),
('en', 'bug', 'osList', 'chromeos', 'Chrome OS', '1', 'rnd'),
('en', 'bug', 'osList', 'fedora', 'Fedora', '1', 'rnd'),
('en', 'bug', 'osList', 'vista', 'Windows Vista', '1', 'rnd'),
('en', 'bug', 'osList', 'win2012', 'Windows 2012', '1', 'rnd'),
('en', 'bug', 'osList', 'win2008', 'Windows 2008', '1', 'rnd'),
('en', 'bug', 'osList', 'win2003', 'Windows 2003', '1', 'rnd'),
('en', 'bug', 'osList', 'win2000', 'Windows 2000', '1', 'rnd'),
('en', 'bug', 'osList', 'wp8', 'WP8', '1', 'rnd'),
('en', 'bug', 'osList', 'wp7', 'WP7', '1', 'rnd'),
('en', 'bug', 'osList', 'symbian', 'Symbian', '1', 'rnd'),
('en', 'bug', 'osList', 'freebsd', 'FreeBSD', '1', 'rnd'),
('en', 'bug', 'osList', 'unix', 'Unix', '1', 'rnd'),
('en', 'bug', 'osList', 'others', 'Others', '1', 'rnd'),
('fr', 'bug', 'osList', 'all', 'Tous', '1', 'rnd'),
('fr', 'bug', 'osList', 'windows', 'Windows', '1', 'rnd'),
('fr', 'bug', 'osList', 'win11', 'Windows 11', '1', 'rnd'),
('fr', 'bug', 'osList', 'win10', 'Windows 10', '1', 'rnd'),
('fr', 'bug', 'osList', 'win8', 'Windows 8', '1', 'rnd'),
('fr', 'bug', 'osList', 'win7', 'Windows 7', '1', 'rnd'),
('fr', 'bug', 'osList', 'winxp', 'Windows XP', '1', 'rnd'),
('fr', 'bug', 'osList', 'osx', 'Mac OS', '1', 'rnd'),
('fr', 'bug', 'osList', 'android', 'Android', '1', 'rnd'),
('fr', 'bug', 'osList', 'ios', 'IOS', '1', 'rnd'),
('fr', 'bug', 'osList', 'linux', 'Linux', '1', 'rnd'),
('fr', 'bug', 'osList', 'ubuntu', 'Ubuntu', '1', 'rnd'),
('fr', 'bug', 'osList', 'chromeos', 'Chrome OS', '1', 'rnd'),
('fr', 'bug', 'osList', 'fedora', 'Fedora', '1', 'rnd'),
('fr', 'bug', 'osList', 'vista', 'Windows Vista', '1', 'rnd'),
('fr', 'bug', 'osList', 'win2012', 'Windows 2012', '1', 'rnd'),
('fr', 'bug', 'osList', 'win2008', 'Windows 2008', '1', 'rnd'),
('fr', 'bug', 'osList', 'win2003', 'Windows 2003', '1', 'rnd'),
('fr', 'bug', 'osList', 'win2000', 'Windows 2000', '1', 'rnd'),
('fr', 'bug', 'osList', 'wp8', 'WP8', '1', 'rnd'),
('fr', 'bug', 'osList', 'wp7', 'WP7', '1', 'rnd'),
('fr', 'bug', 'osList', 'symbian', 'Symbian', '1', 'rnd'),
('fr', 'bug', 'osList', 'freebsd', 'FreeBSD', '1', 'rnd'),
('fr', 'bug', 'osList', 'unix', 'Unix', '1', 'rnd'),
('fr', 'bug', 'osList', 'others', 'Autres', '1', 'rnd'),
('de', 'bug', 'osList', 'all', 'Alle', '1', 'rnd'),
('de', 'bug', 'osList', 'windows', 'Windows', '1', 'rnd'),
('de', 'bug', 'osList', 'win11', 'Windows 11', '1', 'rnd'),
('de', 'bug', 'osList', 'win10', 'Windows 10', '1', 'rnd'),
('de', 'bug', 'osList', 'win8', 'Windows 8', '1', 'rnd'),
('de', 'bug', 'osList', 'win7', 'Windows 7', '1', 'rnd'),
('de', 'bug', 'osList', 'winxp', 'Windows XP', '1', 'rnd'),
('de', 'bug', 'osList', 'osx', 'Mac OS', '1', 'rnd'),
('de', 'bug', 'osList', 'android', 'Android', '1', 'rnd'),
('de', 'bug', 'osList', 'ios', 'IOS', '1', 'rnd'),
('de', 'bug', 'osList', 'linux', 'Linux', '1', 'rnd'),
('de', 'bug', 'osList', 'ubuntu', 'Ubuntu', '1', 'rnd'),
('de', 'bug', 'osList', 'chromeos', 'Chrome OS', '1', 'rnd'),
('de', 'bug', 'osList', 'fedora', 'Fedora', '1', 'rnd'),
('de', 'bug', 'osList', 'vista', 'Windows Vista', '1', 'rnd'),
('de', 'bug', 'osList', 'win2012', 'Windows 2012', '1', 'rnd'),
('de', 'bug', 'osList', 'win2008', 'Windows 2008', '1', 'rnd'),
('de', 'bug', 'osList', 'win2003', 'Windows 2003', '1', 'rnd'),
('de', 'bug', 'osList', 'win2000', 'Windows 2000', '1', 'rnd'),
('de', 'bug', 'osList', 'wp8', 'WP8', '1', 'rnd'),
('de', 'bug', 'osList', 'wp7', 'WP7', '1', 'rnd'),
('de', 'bug', 'osList', 'symbian', 'Symbian', '1', 'rnd'),
('de', 'bug', 'osList', 'freebsd', 'FreeBSD', '1', 'rnd'),
('de', 'bug', 'osList', 'unix', 'Unix', '1', 'rnd'),
('de', 'bug', 'osList', 'others', 'Andere', '1', 'rnd');
db/zentao.sql
+2 -2
View File
@@ -262,8 +262,8 @@ CREATE TABLE IF NOT EXISTS `zt_bug` (
`severity` tinyint(4) NOT NULL default '0',
`pri` tinyint(3) unsigned NOT NULL,
`type` varchar(30) NOT NULL default '',
`os` varchar(30) NOT NULL default '',
`browser` varchar(30) NOT NULL default '',
`os` varchar(255) NOT NULL default '',
`browser` varchar(255) NOT NULL default '',
`hardware` varchar(30) NOT NULL,
`found` varchar(30) NOT NULL default '',
`steps` mediumtext NOT NULL,
module/bug/config.php
+10 -17
View File
@@ -133,35 +133,28 @@ $config->bug->search['params']['branch'] = array('operator' => '=',
$config->bug->search['params']['plan'] = array('operator' => '=', 'control' => 'select', 'values' => '');
$config->bug->search['params']['module'] = array('operator' => 'belong', 'control' => 'select', 'values' => 'modules');
$config->bug->search['params']['execution'] = array('operator' => '=', 'control' => 'select', 'values' => 'executions');
$config->bug->search['params']['severity'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->severityList);
$config->bug->search['params']['pri'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->priList);
$config->bug->search['params']['type'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->typeList);
$config->bug->search['params']['os'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->osList);
$config->bug->search['params']['browser'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->browserList);
$config->bug->search['params']['os'] = array('operator' => 'include', 'control' => 'select', 'values' => $lang->bug->osList);
$config->bug->search['params']['browser'] = array('operator' => 'include', 'control' => 'select', 'values' => $lang->bug->browserList);
$config->bug->search['params']['resolution'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->bug->resolutionList);
$config->bug->search['params']['activatedCount']= array('operator' => '>=', 'control' => 'input', 'values' => '');
$config->bug->search['params']['toTask'] = array('operator' => '=', 'control' => 'input', 'values' => '');
$config->bug->search['params']['toStory'] = array('operator' => '=', 'control' => 'input', 'values' => '');
$config->bug->search['params']['openedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$config->bug->search['params']['closedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$config->bug->search['params']['lastEditedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
$config->bug->search['params']['mailto'] = array('operator' => 'include', 'control' => 'select', 'values' => 'users');
$config->bug->search['params']['mailto'] = array('operator' => 'include', 'control' => 'select', 'values' => 'users');
$config->bug->search['params']['openedBuild'] = array('operator' => 'include', 'control' => 'select', 'values' => 'builds');
$config->bug->search['params']['resolvedBuild'] = array('operator' => '=', 'control' => 'select', 'values' => 'builds');
$config->bug->search['params']['openedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['assignedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['resolvedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['lastEditedDate']= array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['deadline'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['activatedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['openedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['assignedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['resolvedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['lastEditedDate']= array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['deadline'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->search['params']['activatedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->bug->datatable = new stdclass();
$config->bug->datatable->defaultField = array('id', 'severity', 'pri', 'confirmed', 'title', 'status', 'openedBy', 'openedDate', 'assignedTo', 'resolution', 'actions');
module/bug/control.php
+1 -2
View File
@@ -859,6 +859,7 @@ class bug extends control
$this->view->moduleID = $moduleID;
$this->view->branch = $branch;
$this->view->branches = $branches;
$this->display();
}
@@ -1379,8 +1380,6 @@ class bug extends control
$this->view->priList = array('0' => '', 'ditto' => $this->lang->bug->ditto) + $this->lang->bug->priList;
$this->view->resolutionList = array('' => '', 'ditto' => $this->lang->bug->ditto) + $this->lang->bug->resolutionList;
$this->view->statusList = array('' => '', 'ditto' => $this->lang->bug->ditto) + $this->lang->bug->statusList;
$this->view->osList = array('' => '', 'ditto' => $this->lang->bug->ditto) + $this->lang->bug->osList;
$this->view->browserList = array('' => '', 'ditto' => $this->lang->bug->ditto) + $this->lang->bug->browserList;
$this->view->bugs = $bugs;
$this->view->branch = $branch;
$this->view->users = $users;
module/bug/css/create.css
+1
View File
@@ -55,3 +55,4 @@ html[lang='de'] #keywordsAddonLabel, .task {width: 73px;}
#executionLabel {display: inline; position: relative; width: 50%; left: 37%;}
#projectLabel {display: inline;}
#openedBuildLabel {display: inline; position: relative; width: 50%; left: 14%;}
#bugTypeInputGroup > .table-col {width: 40% !important;}
module/bug/css/view.css
+1
View File
@@ -5,3 +5,4 @@
.tab-pane table {border: 1px solid #ddd; border-top: none;}
.btn-edit-comment {z-index: 100;}
.select-project-modal .modal-body {right: 15px;}
.osContent, .browserContent {margin: 0 0 5px;}
module/bug/lang/de.php
+32 -45
View File
@@ -232,51 +232,39 @@ $lang->bug->priList[2] = '2';
$lang->bug->priList[3] = '3';
$lang->bug->priList[4] = '4';
$lang->bug->osList[''] = '';
$lang->bug->osList['all'] = 'Alle';
$lang->bug->osList['windows'] = 'Windows';
$lang->bug->osList['win10'] = 'Windows 10';
$lang->bug->osList['win8'] = 'Windows 8';
$lang->bug->osList['win7'] = 'Windows 7';
$lang->bug->osList['vista'] = 'Windows Vista';
$lang->bug->osList['winxp'] = 'Windows XP';
$lang->bug->osList['win2012'] = 'Windows 2012';
$lang->bug->osList['win2008'] = 'Windows 2008';
$lang->bug->osList['win2003'] = 'Windows 2003';
$lang->bug->osList['win2000'] = 'Windows 2000';
$lang->bug->osList['android'] = 'Android';
$lang->bug->osList['ios'] = 'IOS';
$lang->bug->osList['wp8'] = 'WP8';
$lang->bug->osList['wp7'] = 'WP7';
$lang->bug->osList['symbian'] = 'Symbian';
$lang->bug->osList['linux'] = 'Linux';
$lang->bug->osList['freebsd'] = 'FreeBSD';
$lang->bug->osList['osx'] = 'OS X';
$lang->bug->osList['unix'] = 'Unix';
$lang->bug->osList['others'] = 'Andere';
$lang->bug->osList[''] = '';
$lang->bug->osList['all'] = 'Alle';
$lang->bug->osList['windows'] = 'Windows';
$lang->bug->osList['win11'] = 'Windows 11';
$lang->bug->osList['win10'] = 'Windows 10';
$lang->bug->osList['win8'] = 'Windows 8';
$lang->bug->osList['win7'] = 'Windows 7';
$lang->bug->osList['winxp'] = 'Windows XP';
$lang->bug->osList['osx'] = 'Mac OS';
$lang->bug->osList['android'] = 'Android';
$lang->bug->osList['ios'] = 'IOS';
$lang->bug->osList['linux'] = 'Linux';
$lang->bug->osList['ubuntu'] = 'Ubuntu';
$lang->bug->osList['chromeos'] = 'Chrome OS';
$lang->bug->osList['fedora'] = 'Fedora';
$lang->bug->osList['unix'] = 'Unix';
$lang->bug->osList['others'] = 'Andere';
$lang->bug->browserList[''] = '';
$lang->bug->browserList['all'] = 'Alle';
$lang->bug->browserList['ie'] = 'IE series';
$lang->bug->browserList['ie11'] = 'IE11';
$lang->bug->browserList['ie10'] = 'IE10';
$lang->bug->browserList['ie9'] = 'IE9';
$lang->bug->browserList['ie8'] = 'IE8';
$lang->bug->browserList['ie7'] = 'IE7';
$lang->bug->browserList['ie6'] = 'IE6';
$lang->bug->browserList['chrome'] = 'chrome';
$lang->bug->browserList['firefox'] = 'Firefox series';
$lang->bug->browserList['firefox4'] = 'Firefox4';
$lang->bug->browserList['firefox3'] = 'Firefox3';
$lang->bug->browserList['firefox2'] = 'Firefox2';
$lang->bug->browserList['opera'] = 'Opera series';
$lang->bug->browserList['oprea11'] = 'Opera11';
$lang->bug->browserList['oprea10'] = 'Opera10';
$lang->bug->browserList['opera9'] = 'Opera9';
$lang->bug->browserList['safari'] = 'Safari';
$lang->bug->browserList['maxthon'] = 'Maxthon';
$lang->bug->browserList['uc'] = 'UC';
$lang->bug->browserList['other'] = 'Andere';
$lang->bug->browserList[''] = '';
$lang->bug->browserList['all'] = 'Alle';
$lang->bug->browserList['chrome'] = 'Chrome';
$lang->bug->browserList['edge'] = 'Edge';
$lang->bug->browserList['ie'] = 'IE series';
$lang->bug->browserList['ie11'] = 'IE11';
$lang->bug->browserList['ie10'] = 'IE10';
$lang->bug->browserList['ie9'] = 'IE9';
$lang->bug->browserList['ie8'] = 'IE8';
$lang->bug->browserList['firefox'] = 'Firefox series';
$lang->bug->browserList['opera'] = 'Opera series';
$lang->bug->browserList['safari'] = 'Safari';
$lang->bug->browserList['360'] = '360 series';
$lang->bug->browserList['qq'] = 'QQ series';
$lang->bug->browserList['other'] = 'Andere';
$lang->bug->typeList[''] = '';
$lang->bug->typeList['codeerror'] = 'Code Fehler';
@@ -428,7 +416,6 @@ $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed;
$lang->bug->featureBar['browse']['openedbyme'] = $lang->bug->openedByMe;
$lang->bug->featureBar['browse']['assigntome'] = $lang->bug->assignToMe;
$lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe;
$lang->bug->featureBar['browse']['unresolved'] = $lang->bug->unResolved;
$lang->bug->featureBar['browse']['more'] = $lang->more;
module/bug/lang/en.php
+32 -45
View File
@@ -232,51 +232,39 @@ $lang->bug->priList[2] = '2';
$lang->bug->priList[3] = '3';
$lang->bug->priList[4] = '4';
$lang->bug->osList[''] = '';
$lang->bug->osList['all'] = 'All';
$lang->bug->osList['windows'] = 'Windows';
$lang->bug->osList['win10'] = 'Windows 10';
$lang->bug->osList['win8'] = 'Windows 8';
$lang->bug->osList['win7'] = 'Windows 7';
$lang->bug->osList['vista'] = 'Windows Vista';
$lang->bug->osList['winxp'] = 'Windows XP';
$lang->bug->osList['win2012'] = 'Windows 2012';
$lang->bug->osList['win2008'] = 'Windows 2008';
$lang->bug->osList['win2003'] = 'Windows 2003';
$lang->bug->osList['win2000'] = 'Windows 2000';
$lang->bug->osList['android'] = 'Android';
$lang->bug->osList['ios'] = 'IOS';
$lang->bug->osList['wp8'] = 'WP8';
$lang->bug->osList['wp7'] = 'WP7';
$lang->bug->osList['symbian'] = 'Symbian';
$lang->bug->osList['linux'] = 'Linux';
$lang->bug->osList['freebsd'] = 'FreeBSD';
$lang->bug->osList['osx'] = 'OS X';
$lang->bug->osList['unix'] = 'Unix';
$lang->bug->osList['others'] = 'Others';
$lang->bug->osList[''] = '';
$lang->bug->osList['all'] = 'All';
$lang->bug->osList['windows'] = 'Windows';
$lang->bug->osList['win11'] = 'Windows 11';
$lang->bug->osList['win10'] = 'Windows 10';
$lang->bug->osList['win8'] = 'Windows 8';
$lang->bug->osList['win7'] = 'Windows 7';
$lang->bug->osList['winxp'] = 'Windows XP';
$lang->bug->osList['osx'] = 'Mac OS';
$lang->bug->osList['android'] = 'Android';
$lang->bug->osList['ios'] = 'IOS';
$lang->bug->osList['linux'] = 'Linux';
$lang->bug->osList['ubuntu'] = 'Ubuntu';
$lang->bug->osList['chromeos'] = 'Chrome OS';
$lang->bug->osList['fedora'] = 'Fedora';
$lang->bug->osList['unix'] = 'Unix';
$lang->bug->osList['others'] = 'Others';
$lang->bug->browserList[''] = '';
$lang->bug->browserList['all'] = 'All';
$lang->bug->browserList['ie'] = 'IE series';
$lang->bug->browserList['ie11'] = 'IE11';
$lang->bug->browserList['ie10'] = 'IE10';
$lang->bug->browserList['ie9'] = 'IE9';
$lang->bug->browserList['ie8'] = 'IE8';
$lang->bug->browserList['ie7'] = 'IE7';
$lang->bug->browserList['ie6'] = 'IE6';
$lang->bug->browserList['chrome'] = 'Chrome';
$lang->bug->browserList['firefox'] = 'Firefox series';
$lang->bug->browserList['firefox4'] = 'Firefox4';
$lang->bug->browserList['firefox3'] = 'Firefox3';
$lang->bug->browserList['firefox2'] = 'Firefox2';
$lang->bug->browserList['opera'] = 'Opera series';
$lang->bug->browserList['oprea11'] = 'Opera11';
$lang->bug->browserList['oprea10'] = 'Opera10';
$lang->bug->browserList['opera9'] = 'Opera9';
$lang->bug->browserList['safari'] = 'Safari';
$lang->bug->browserList['maxthon'] = 'Maxthon';
$lang->bug->browserList['uc'] = 'UC';
$lang->bug->browserList['other'] = 'Others';
$lang->bug->browserList[''] = '';
$lang->bug->browserList['all'] = 'All';
$lang->bug->browserList['chrome'] = 'Chrome';
$lang->bug->browserList['edge'] = 'Edge';
$lang->bug->browserList['ie'] = 'IE series';
$lang->bug->browserList['ie11'] = 'IE11';
$lang->bug->browserList['ie10'] = 'IE10';
$lang->bug->browserList['ie9'] = 'IE9';
$lang->bug->browserList['ie8'] = 'IE8';
$lang->bug->browserList['firefox'] = 'Firefox series';
$lang->bug->browserList['opera'] = 'Opera series';
$lang->bug->browserList['safari'] = 'Safari';
$lang->bug->browserList['360'] = '360 series';
$lang->bug->browserList['qq'] = 'QQ series';
$lang->bug->browserList['other'] = 'Others';
$lang->bug->typeList[''] = '';
$lang->bug->typeList['codeerror'] = 'CodeError';
@@ -428,7 +416,6 @@ $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed;
$lang->bug->featureBar['browse']['openedbyme'] = $lang->bug->openedByMe;
$lang->bug->featureBar['browse']['assigntome'] = $lang->bug->assignToMe;
$lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe;
$lang->bug->featureBar['browse']['unresolved'] = $lang->bug->unResolved;
$lang->bug->featureBar['browse']['more'] = $lang->more;
module/bug/lang/fr.php
+32 -45
View File
@@ -232,51 +232,39 @@ $lang->bug->priList[2] = '2';
$lang->bug->priList[3] = '3';
$lang->bug->priList[4] = '4';
$lang->bug->osList[''] = '';
$lang->bug->osList['all'] = 'Tous';
$lang->bug->osList['windows'] = 'Windows';
$lang->bug->osList['win10'] = 'Windows 10';
$lang->bug->osList['win8'] = 'Windows 8';
$lang->bug->osList['win7'] = 'Windows 7';
$lang->bug->osList['vista'] = 'Windows Vista';
$lang->bug->osList['winxp'] = 'Windows XP';
$lang->bug->osList['win2012'] = 'Windows 2012';
$lang->bug->osList['win2008'] = 'Windows 2008';
$lang->bug->osList['win2003'] = 'Windows 2003';
$lang->bug->osList['win2000'] = 'Windows 2000';
$lang->bug->osList['android'] = 'Android';
$lang->bug->osList['ios'] = 'IOS';
$lang->bug->osList['wp8'] = 'WP8';
$lang->bug->osList['wp7'] = 'WP7';
$lang->bug->osList['symbian'] = 'Symbian';
$lang->bug->osList['linux'] = 'Linux';
$lang->bug->osList['freebsd'] = 'FreeBSD';
$lang->bug->osList['osx'] = 'OS X';
$lang->bug->osList['unix'] = 'Unix';
$lang->bug->osList['others'] = 'Autres';
$lang->bug->osList[''] = '';
$lang->bug->osList['all'] = 'Tous';
$lang->bug->osList['windows'] = 'Windows';
$lang->bug->osList['win11'] = 'Windows 11';
$lang->bug->osList['win10'] = 'Windows 10';
$lang->bug->osList['win8'] = 'Windows 8';
$lang->bug->osList['win7'] = 'Windows 7';
$lang->bug->osList['winxp'] = 'Windows XP';
$lang->bug->osList['osx'] = 'Mac OS';
$lang->bug->osList['android'] = 'Android';
$lang->bug->osList['ios'] = 'IOS';
$lang->bug->osList['linux'] = 'Linux';
$lang->bug->osList['ubuntu'] = 'Ubuntu';
$lang->bug->osList['chromeos'] = 'Chrome OS';
$lang->bug->osList['fedora'] = 'Fedora';
$lang->bug->osList['unix'] = 'Unix';
$lang->bug->osList['others'] = 'Autres';
$lang->bug->browserList[''] = '';
$lang->bug->browserList['all'] = 'Tous';
$lang->bug->browserList['ie'] = 'IE series';
$lang->bug->browserList['ie11'] = 'IE11';
$lang->bug->browserList['ie10'] = 'IE10';
$lang->bug->browserList['ie9'] = 'IE9';
$lang->bug->browserList['ie8'] = 'IE8';
$lang->bug->browserList['ie7'] = 'IE7';
$lang->bug->browserList['ie6'] = 'IE6';
$lang->bug->browserList['chrome'] = 'Chrome';
$lang->bug->browserList['firefox'] = 'Firefox series';
$lang->bug->browserList['firefox4'] = 'Firefox4';
$lang->bug->browserList['firefox3'] = 'Firefox3';
$lang->bug->browserList['firefox2'] = 'Firefox2';
$lang->bug->browserList['opera'] = 'Opera series';
$lang->bug->browserList['oprea11'] = 'Opera11';
$lang->bug->browserList['oprea10'] = 'Opera10';
$lang->bug->browserList['opera9'] = 'Opera9';
$lang->bug->browserList['safari'] = 'Safari';
$lang->bug->browserList['maxthon'] = 'Maxthon';
$lang->bug->browserList['uc'] = 'UC';
$lang->bug->browserList['other'] = 'Autres';
$lang->bug->browserList[''] = '';
$lang->bug->browserList['all'] = 'Tous';
$lang->bug->browserList['chrome'] = 'Chrome';
$lang->bug->browserList['edge'] = 'Edge';
$lang->bug->browserList['ie'] = 'IE series';
$lang->bug->browserList['ie11'] = 'IE11';
$lang->bug->browserList['ie10'] = 'IE10';
$lang->bug->browserList['ie9'] = 'IE9';
$lang->bug->browserList['ie8'] = 'IE8';
$lang->bug->browserList['firefox'] = 'Firefox series';
$lang->bug->browserList['opera'] = 'Opera series';
$lang->bug->browserList['safari'] = 'Safari';
$lang->bug->browserList['360'] = '360 series';
$lang->bug->browserList['qq'] = 'QQ series';
$lang->bug->browserList['other'] = 'Autres';
$lang->bug->typeList[''] = '';
$lang->bug->typeList['codeerror'] = 'Code Erreur';
@@ -428,7 +416,6 @@ $lang->bug->featureBar['browse']['unclosed'] = $lang->bug->unclosed;
$lang->bug->featureBar['browse']['openedbyme'] = $lang->bug->openedByMe;
$lang->bug->featureBar['browse']['assigntome'] = $lang->bug->assignToMe;
$lang->bug->featureBar['browse']['resolvedbyme'] = $lang->bug->resolvedByMe;
$lang->bug->featureBar['browse']['unresolved'] = $lang->bug->unResolved;
$lang->bug->featureBar['browse']['more'] = $lang->more;
module/bug/lang/zh-cn.php
+32 -45
View File
@@ -232,51 +232,39 @@ $lang->bug->priList[2] = '2';
$lang->bug->priList[3] = '3';
$lang->bug->priList[4] = '4';
$lang->bug->osList[''] = '';
$lang->bug->osList['all'] = '全部';
$lang->bug->osList['windows'] = 'Windows';
$lang->bug->osList['win10'] = 'Windows 10';
$lang->bug->osList['win8'] = 'Windows 8';
$lang->bug->osList['win7'] = 'Windows 7';
$lang->bug->osList['vista'] = 'Windows Vista';
$lang->bug->osList['winxp'] = 'Windows XP';
$lang->bug->osList['win2012'] = 'Windows 2012';
$lang->bug->osList['win2008'] = 'Windows 2008';
$lang->bug->osList['win2003'] = 'Windows 2003';
$lang->bug->osList['win2000'] = 'Windows 2000';
$lang->bug->osList['android'] = 'Android';
$lang->bug->osList['ios'] = 'IOS';
$lang->bug->osList['wp8'] = 'WP8';
$lang->bug->osList['wp7'] = 'WP7';
$lang->bug->osList['symbian'] = 'Symbian';
$lang->bug->osList['linux'] = 'Linux';
$lang->bug->osList['freebsd'] = 'FreeBSD';
$lang->bug->osList['osx'] = 'OS X';
$lang->bug->osList['unix'] = 'Unix';
$lang->bug->osList['others'] = '其他';
$lang->bug->osList[''] = '';
$lang->bug->osList['all'] = '全部';
$lang->bug->osList['windows'] = 'Windows';
$lang->bug->osList['win11'] = 'Windows 11';
$lang->bug->osList['win10'] = 'Windows 10';
$lang->bug->osList['win8'] = 'Windows 8';
$lang->bug->osList['win7'] = 'Windows 7';
$lang->bug->osList['winxp'] = 'Windows XP';
$lang->bug->osList['osx'] = 'Mac OS';
$lang->bug->osList['android'] = 'Android';
$lang->bug->osList['ios'] = 'IOS';
$lang->bug->osList['linux'] = 'Linux';
$lang->bug->osList['ubuntu'] = 'Ubuntu';
$lang->bug->osList['chromeos'] = 'Chrome OS';
$lang->bug->osList['fedora'] = 'Fedora';
$lang->bug->osList['unix'] = 'Unix';
$lang->bug->osList['others'] = '其他';
$lang->bug->browserList[''] = '';
$lang->bug->browserList['all'] = '全部';
$lang->bug->browserList['ie'] = 'IE系列';
$lang->bug->browserList['ie11'] = 'IE11';
$lang->bug->browserList['ie10'] = 'IE10';
$lang->bug->browserList['ie9'] = 'IE9';
$lang->bug->browserList['ie8'] = 'IE8';
$lang->bug->browserList['ie7'] = 'IE7';
$lang->bug->browserList['ie6'] = 'IE6';
$lang->bug->browserList['chrome'] = 'chrome';
$lang->bug->browserList['firefox'] = 'firefox系列';
$lang->bug->browserList['firefox4'] = 'firefox4';
$lang->bug->browserList['firefox3'] = 'firefox3';
$lang->bug->browserList['firefox2'] = 'firefox2';
$lang->bug->browserList['opera'] = 'opera系列';
$lang->bug->browserList['oprea11'] = 'opera11';
$lang->bug->browserList['oprea10'] = 'opera10';
$lang->bug->browserList['opera9'] = 'opera9';
$lang->bug->browserList['safari'] = 'safari';
$lang->bug->browserList['maxthon'] = '傲游';
$lang->bug->browserList['uc'] = 'UC';
$lang->bug->browserList['other'] = '其他';
$lang->bug->browserList[''] = '';
$lang->bug->browserList['all'] = '全部';
$lang->bug->browserList['chrome'] = 'Chrome';
$lang->bug->browserList['edge'] = 'Edge';
$lang->bug->browserList['ie'] = 'IE系列';
$lang->bug->browserList['ie11'] = 'IE11';
$lang->bug->browserList['ie10'] = 'IE10';
$lang->bug->browserList['ie9'] = 'IE9';
$lang->bug->browserList['ie8'] = 'IE8';
$lang->bug->browserList['firefox'] = 'firefox系列';
$lang->bug->browserList['opera'] = 'opera系列';
$lang->bug->browserList['safari'] = 'safari';
$lang->bug->browserList['360'] = '360浏览器';
$lang->bug->browserList['qq'] = 'QQ浏览器';
$lang->bug->browserList['other'] = '其他';
$lang->bug->typeList[''] = '';
$lang->bug->typeList['codeerror'] = '代码错误';
@@ -432,7 +420,6 @@ $lang->bug->featureBar['browse']['assignedbyme'] = $lang->bug->assignedByMe;
$lang->bug->featureBar['browse']['unresolved'] = $lang->bug->unResolved;
$lang->bug->featureBar['browse']['more'] = $lang->more;
$lang->bug->moreSelects['unconfirmed'] = $lang->bug->unconfirmed;
$lang->bug->moreSelects['assigntonull'] = $lang->bug->assignToNull;
$lang->bug->moreSelects['longlifebugs'] = $lang->bug->longLifeBugs;
module/bug/model.php
+45 -17
View File
@@ -76,6 +76,8 @@ class bugModel extends model
->trim('title')
->join('openedBuild', ',')
->join('mailto', ',')
->join('os', ',')
->join('browser', ',')
->remove('files,labels,uid,oldTaskID,contactListMenu,region,lane')
->get();
@@ -163,25 +165,24 @@ class bugModel extends model
$execution = 0;
$type = '';
$pri = 0;
$os = '';
$browser = '';
foreach($data->title as $i => $title)
{
$oses = array_filter($data->oses[$i]);
$browsers = array_filter($data->browsers[$i]);
if($data->modules[$i] != 'ditto') $module = (int)$data->modules[$i];
if($data->projects[$i] != 'ditto') $project = (int)$data->projects[$i];
if($data->executions[$i] != 'ditto') $execution = (int)$data->executions[$i];
if($data->types[$i] != 'ditto') $type = $data->types[$i];
if($data->pris[$i] != 'ditto') $pri = $data->pris[$i];
if($data->oses[$i] != 'ditto') $os = $data->oses[$i];
if($data->browsers[$i] != 'ditto') $browser = $data->browsers[$i];
$data->modules[$i] = (int)$module;
$data->projects[$i] = (int)$project;
$data->executions[$i] = (int)$execution;
$data->types[$i] = $type;
$data->pris[$i] = $pri;
$data->oses[$i] = $os;
$data->browsers[$i] = $browser;
$data->oses[$i] = implode(',', $oses);
$data->browsers[$i] = implode(',', $browsers);
}
/* Get bug data. */
@@ -689,6 +690,8 @@ class bugModel extends model
->stripTags($this->config->bug->editor->edit['id'], $this->config->allowedTags)
->setDefault('product,module,execution,story,task,duplicateBug,branch', 0)
->setDefault('openedBuild', '')
->setDefault('os', '')
->setDefault('browser', '')
->setDefault('plan', 0)
->setDefault('deadline', '0000-00-00')
->setDefault('resolvedDate', '0000-00-00 00:00:00')
@@ -699,6 +702,8 @@ class bugModel extends model
->join('openedBuild', ',')
->join('mailto', ',')
->join('linkBug', ',')
->join('os', ',')
->join('browser', ',')
->setIF($this->post->assignedTo != $oldBug->assignedTo, 'assignedDate', $now)
->setIF($this->post->resolvedBy != '' and $this->post->resolvedDate == '', 'resolvedDate', $now)
->setIF($this->post->resolution != '' and $this->post->resolvedDate == '', 'resolvedDate', $now)
@@ -805,8 +810,6 @@ class bugModel extends model
if($data->assignedTos[$bugID] == 'ditto') $data->assignedTos[$bugID] = isset($prev['assignedTo']) ? $prev['assignedTo'] : '';
if($data->resolvedBys[$bugID] == 'ditto') $data->resolvedBys[$bugID] = isset($prev['resolvedBy']) ? $prev['resolvedBy'] : '';
if($data->resolutions[$bugID] == 'ditto') $data->resolutions[$bugID] = isset($prev['resolution']) ? $prev['resolution'] : '';
if($data->os[$bugID] == 'ditto') $data->os[$bugID] = isset($prev['os']) ? $prev['os'] : '';
if($data->browsers[$bugID] == 'ditto') $data->browsers[$bugID] = isset($prev['browser']) ? $prev['browser'] : '';
if(isset($data->branches[$bugID]) and $data->branches[$bugID] == 'ditto') $data->branches[$bugID] = isset($prev['branch']) ? $prev['branch'] : 0;
$prev['type'] = $data->types[$bugID];
@@ -817,8 +820,6 @@ class bugModel extends model
$prev['assignedTo'] = $data->assignedTos[$bugID];
$prev['resolvedBy'] = $data->resolvedBys[$bugID];
$prev['resolution'] = $data->resolutions[$bugID];
$prev['os'] = $data->os[$bugID];
$prev['browser'] = $data->browsers[$bugID];
}
/* Initialize bugs from the post data.*/
@@ -828,6 +829,9 @@ class bugModel extends model
{
$oldBug = $oldBugs[$bugID];
$os = array_filter($data->os[$bugID]);
$browsers = array_filter($data->browsers[$bugID]);
$bug = new stdclass();
$bug->id = $bugID;
$bug->lastEditedBy = $this->app->user->account;
@@ -844,8 +848,8 @@ class bugModel extends model
$bug->deadline = $data->deadlines[$bugID];
$bug->resolvedBy = $data->resolvedBys[$bugID];
$bug->keywords = $data->keywords[$bugID];
$bug->os = $data->os[$bugID];
$bug->browser = $data->browsers[$bugID];
$bug->os = implode(',', $os);
$bug->browser = implode(',', $browsers);
$bug->resolution = $data->resolutions[$bugID];
$bug->duplicateBug = $data->duplicateBugs[$bugID] ? $data->duplicateBugs[$bugID] : $oldBug->duplicateBug;
@@ -3170,9 +3174,25 @@ class bugModel extends model
}
}
$bugLink = helper::createLink('bug', 'view', "bugID=$bug->id");
$account = $this->app->user->account;
$id = $col->id;
$bugLink = helper::createLink('bug', 'view', "bugID=$bug->id");
$account = $this->app->user->account;
$id = $col->id;
$os = '';
$browser = '';
$osList = explode(',', $bug->os);
$browserList = explode(',', $bug->browser);
foreach($osList as $value)
{
if(empty($value)) continue;
$os .= $this->lang->bug->osList[$value] . ',';
}
foreach($browserList as $value)
{
if(empty($value)) continue;
$browser .= $this->lang->bug->browserList[$value] . ',';
}
$os = trim($os, ',');
$browser = trim($browser, ',');
if($col->show)
{
$class = "c-$id";
@@ -3221,6 +3241,14 @@ class bugModel extends model
$class .= ' text-ellipsis';
$title = "title='" . $bug->resolvedBuild . "'";
break;
case 'os':
$class .= ' text-ellipsis';
$title = "title='" . $os . "'";
break;
case 'browser':
$class .= ' text-ellipsis';
$title = "title='" . $browser . "'";
break;
}
if($id == 'deadline' && isset($bug->delay) && $bug->status == 'active') $class .= ' delayed';
@@ -3319,10 +3347,10 @@ class bugModel extends model
echo $bug->keywords;
break;
case 'os':
echo zget($this->lang->bug->osList, $bug->os);
echo $os;
break;
case 'browser':
echo zget($this->lang->bug->browserList, $bug->browser);
echo $browser;
break;
case 'mailto':
$mailto = explode(',', $bug->mailto);
module/bug/view/batchcreate.html.php
+8 -14
View File
@@ -92,8 +92,6 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
$executions += array('ditto' => $lang->bug->ditto);
$lang->bug->typeList += array('ditto' => $lang->bug->ditto);
$lang->bug->priList += array('ditto' => $lang->bug->ditto);
$lang->bug->osList += array('ditto' => $lang->bug->ditto);
$lang->bug->browserList += array('ditto' => $lang->bug->ditto);
?>
<?php $i = 1; ?>
<?php if(!empty($titles)):?>
@@ -104,8 +102,6 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
$executionID = $i == 1 ? $executionID : 'ditto';
$type = $i == 1 ? '' : 'ditto';
$pri = $i == 1 ? 0 : 'ditto';
$os = $i == 1 ? '' : 'ditto';
$browser = $i == 1 ? '' : 'ditto';
?>
<tr>
<td class='text-left'><?php echo $i;?></td>
@@ -139,8 +135,8 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
<td class='<?php echo zget($visibleFields, 'type', 'hidden')?> typeBox' style='overflow:visible'> <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'pri', 'hidden')?> priBox' style='overflow:visible'> <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
<td class='<?php echo zget($visibleFields, 'severity', 'hidden')?> severityBox' style='overflow:visible'><?php echo html::select("severities[$i]", $lang->bug->severityList, '3', "class='form-control'");?></td>
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?> osBox' style='overflow:visible'> <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?> browserBox' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?> osBox' style='overflow:visible'> <?php echo html::select("oses[$i][]", $lang->bug->osList, '', "class='form-control chosen' multiple");?></td>
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?> browserBox' style='overflow:visible'> <?php echo html::select("browsers[$i][]", $lang->bug->browserList, '', "class='form-control chosen' multiple");?></td>
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?> keywordsBox'><?php echo html::input("keywords[$i]", '', "class='form-control'");?></td>
<?php
$this->loadModel('flow');
@@ -164,8 +160,6 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
$executionID = $i - $nextStart == 0 ? $executionID : 'ditto';
$type = $i - $nextStart == 0 ? '' : 'ditto';
$pri = $i - $nextStart == 0 ? 0 : 'ditto';
$os = $i - $nextStart == 0 ? '' : 'ditto';
$browser = $i - $nextStart == 0 ? '' : 'ditto';
?>
<tr>
<td><?php echo $i;?></td>
@@ -199,8 +193,8 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
<td class='<?php echo zget($visibleFields, 'type', 'hidden')?> typeBox' style='overflow:visible'> <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'pri', 'hidden')?> priBox' style='overflow:visible'> <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
<td class='<?php echo zget($visibleFields, 'severity', 'hidden')?> severityBox' style='overflow:visible'><?php echo html::select("severities[$i]", $lang->bug->severityList, '3', "class='form-control'");?></td>
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?> osBox' style='overflow:visible'> <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?> browserBox' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?> osBox' style='overflow:visible'> <?php echo html::select("oses[$i][]", $lang->bug->osList, '', "class='form-control chosen' multiple");?></td>
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?> browserBox' style='overflow:visible'> <?php echo html::select("browsers[$i][]", $lang->bug->browserList, '', "class='form-control chosen' multiple");?></td>
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?> keywordsBox'><?php echo html::input("keywords[$i]", '', "class='form-control'");?></td>
<?php
$this->loadModel('flow');
@@ -258,8 +252,8 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
<td class='<?php echo zget($visibleFields, 'type', 'hidden')?> typeBox' style='overflow:visible'> <?php echo html::select("types[%s]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'pri', 'hidden')?> priBox' style='overflow:visible'> <?php echo html::select("pris[%s]", $lang->bug->priList, $pri, "class='form-control'");?></td>
<td class='<?php echo zget($visibleFields, 'severity', 'hidden')?> severityBox' style='overflow:visible'><?php echo html::select("severities[%s]", $lang->bug->severityList, '3', "class='form-control'");?></td>
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?> osBox' style='overflow:visible'> <?php echo html::select("oses[%s]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?> browserBox' style='overflow:visible'> <?php echo html::select("browsers[%s]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?> osBox' style='overflow:visible'> <?php echo html::select("oses[%s][]", $lang->bug->osList, '', "class='form-control chosen' multiple");?></td>
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?> browserBox' style='overflow:visible'> <?php echo html::select("browsers[%s][]", $lang->bug->browserList, '', "class='form-control chosen' multiple");?></td>
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?> keywordsBox'><?php echo html::input("keywords[%s]", '', "class='form-control'");?></td>
<?php
$this->loadModel('flow');
@@ -307,8 +301,8 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
<td class='<?php echo zget($visibleFields, 'type', 'hidden')?> typeBox' style='overflow:visible'> <?php echo html::select("types[$i]", $lang->bug->typeList, $type, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'pri', 'hidden')?> priBox' style='overflow:visible'> <?php echo html::select("pris[$i]", $lang->bug->priList, $pri, "class='form-control'");?></td>
<td class='<?php echo zget($visibleFields, 'severity', 'hidden')?> severityBox' style='overflow:visible'><?php echo html::select("severities[$i]", $lang->bug->severityList, '3', "class='form-control'");?></td>
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?> osBox' style='overflow:visible'> <?php echo html::select("oses[$i]", $lang->bug->osList, $os, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?> browserBox' style='overflow:visible'> <?php echo html::select("browsers[$i]", $lang->bug->browserList, $browser, "class='form-control chosen'");?></td>
<td class='<?php echo zget($visibleFields, 'os', 'hidden')?> osBox' style='overflow:visible'> <?php echo html::select("oses[$i][]", $lang->bug->osList, '', "class='form-control chosen' multiple");?></td>
<td class='<?php echo zget($visibleFields, 'browser', 'hidden')?> browserBox' style='overflow:visible'> <?php echo html::select("browsers[$i][]", $lang->bug->browserList, '', "class='form-control chosen' multiple");?></td>
<td class='<?php echo zget($visibleFields, 'keywords', 'hidden')?> keywordsBox'><?php echo html::input("keywords[$i]", '', "class='form-control'");?></td>
<?php
$this->loadModel('flow');
module/bug/view/batchedit.html.php
+2 -2
View File
@@ -134,8 +134,8 @@
?>
<td class='<?php echo zget($visibleFields, 'assignedTo', ' hidden')?>' style='overflow:visible'><?php echo html::select("assignedTos[$bugID]", $assignedToList, $bug->assignedTo, "class='form-control picker-select' data-drop-width='135px'");?></td>
<td class='<?php echo zget($visibleFields, 'deadline', ' hidden')?>' style='overflow:visible'><?php echo html::input("deadlines[$bugID]", helper::isZeroDate($bug->deadline) ? '' : $bug->deadline, "class='form-control form-date'");?></td>
<td <?php echo zget($visibleFields, 'os', "class='hidden'")?>><?php echo html::select("os[$bugID]", $osList, $bug->os, 'class=form-control');?></td>
<td <?php echo zget($visibleFields, 'browser', "class='hidden'")?>><?php echo html::select("browsers[$bugID]", $browserList, $bug->browser, 'class=form-control');?></td>
<td <?php echo zget($visibleFields, 'os', "class='hidden'")?>><?php echo html::select("os[$bugID][]", $lang->bug->osList, $bug->os, 'class="form-control chosen" multiple');?></td>
<td <?php echo zget($visibleFields, 'browser', "class='hidden'")?>><?php echo html::select("browsers[$bugID][]", $lang->bug->browserList, $bug->browser, 'class="form-control chosen" multiple');?></td>
<td <?php echo zget($visibleFields, 'keywords', "class='hidden'")?>><?php echo html::input("keywords[$bugID]", $bug->keywords, 'class=form-control');?></td>
<td class='<?php echo zget($visibleFields, 'resolvedBy', ' hidden')?>' style='overflow:visible'><?php echo html::select("resolvedBys[$bugID]", $users, $bug->resolvedBy, "class='form-control picker-select' data-drop-width='auto'");?></td>
<td <?php echo zget($visibleFields, 'resolution', "class='hidden'")?>>
module/bug/view/create.html.php
+14 -6
View File
@@ -91,12 +91,20 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
<div class='input-group' id='bugTypeInputGroup'>
<?php echo html::select('type', $lang->bug->typeList, $type, "class='form-control'");?>
<?php if($showOS):?>
<span class='input-group-addon fix-border'><?php echo $lang->bug->os?></span>
<?php echo html::select('os', $lang->bug->osList, $os, "class='form-control'");?>
<div class='table-col'>
<div class='input-group'>
<span class='input-group-addon fix-border'><?php echo $lang->bug->os?></span>
<?php echo html::select('os[]', $lang->bug->osList, $os, "class='form-control chosen' multiple");?>
</div>
</div>
<?php endif;?>
<?php if($showBrowser):?>
<span class='input-group-addon fix-border'><?php echo $lang->bug->browser?></span>
<?php echo html::select('browser', $lang->bug->browserList, $browser, "class='form-control'");?>
<div class='table-col'>
<div class='input-group'>
<span class='input-group-addon fix-border'><?php echo $lang->bug->browser?></span>
<?php echo html::select('browser[]', $lang->bug->browserList, $browser, "class='form-control chosen' multiple");?>
</div>
</div>
<?php endif;?>
</div>
</td>
@@ -186,7 +194,7 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
<div class='table-col' id='osBox'>
<div class='input-group'>
<span class='input-group-addon fix-border'><?php echo $lang->bug->os?></span>
<?php echo html::select('os', $lang->bug->osList, $os, "class='form-control chosen'");?>
<?php echo html::select('os[]', $lang->bug->osList, $os, "class='form-control chosen' multiple");?>
</div>
</div>
<?php endif;?>
@@ -194,7 +202,7 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
<div class='table-col'>
<div class='input-group'>
<span class='input-group-addon fix-border'><?php echo $lang->bug->browser?></span>
<?php echo html::select('browser', $lang->bug->browserList, $browser, "class='form-control chosen'");?>
<?php echo html::select('browser[]', $lang->bug->browserList, $browser, "class='form-control chosen' multiple");?>
</div>
</div>
<?php endif;?>
module/bug/view/edit.html.php
+2 -2
View File
@@ -173,11 +173,11 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project);
</tr>
<tr>
<th><?php echo $lang->bug->os;?></th>
<td><?php echo html::select('os', $lang->bug->osList, $bug->os, "class='form-control chosen'");?></td>
<td><?php echo html::select('os[]', $lang->bug->osList, $bug->os, "class='form-control chosen' multiple");?></td>
</tr>
<tr>
<th><?php echo $lang->bug->browser;?></th>
<td><?php echo html::select('browser', $lang->bug->browserList, $bug->browser, "class='form-control chosen'");?></td>
<td><?php echo html::select('browser[]', $lang->bug->browserList, $bug->browser, "class='form-control chosen' multiple");?></td>
</tr>
<tr>
<th><?php echo $lang->bug->keywords;?></th>
module/bug/view/view.html.php
+20 -2
View File
@@ -232,11 +232,29 @@
</tr>
<tr>
<th><?php echo $lang->bug->os;?></th>
<td><?php echo $lang->bug->osList[$bug->os];?></td>
<td>
<?php $osList = explode(',', $bug->os);?>
<?php if($osList):?>
<p class='osContent'>
<?php foreach($osList as $os):?>
<?php if($os) echo "<span class='label label-outline'>" . zget($lang->bug->osList, $os) . "</span>";?>
<?php endforeach;?>
</p>
<?php endif;?>
</td>
</tr>
<tr>
<th><?php echo $lang->bug->browser;?></th>
<td><?php echo $lang->bug->browserList[$bug->browser];?></td>
<td>
<?php $browserList = explode(',', $bug->browser);?>
<?php if($browserList):?>
<p class='browserContent'>
<?php foreach($browserList as $browser):?>
<?php if($os) echo "<span class='label label-outline'>" . zget($lang->bug->browserList, $browser) . "</span>";?>
<?php endforeach;?>
</p>
<?php endif;?>
</td>
</tr>
<tr>
<th><?php echo $lang->bug->keywords;?></th>
module/execution/control.php
+1 -1
View File
@@ -632,7 +632,7 @@ class execution extends control
$this->config->bug->search['params']['product']['values'] = array(''=>'');
}
$this->config->bug->search['params']['execution']['values'] = array(''=>'') + $executions + array('all'=>$this->lang->execution->aboveAllExecution);
$this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs(array_keys($products));
$this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs(array_keys($products));
$this->config->bug->search['module'] = 'importBug';
$this->config->bug->search['params']['confirmed']['values'] = array('' => '') + $this->lang->bug->confirmedList;
module/kanban/model.php
+1
View File
@@ -1664,6 +1664,7 @@ class kanbanModel extends model
if(in_array($groupBy, array('type', 'category', 'source')) and $object->$groupBy !== $laneID) continue;
if($groupBy == 'assignedTo')
{
$laneID = (string)$laneID;
if(empty($object->team) and $object->$groupBy !== $laneID) continue;
if(!empty($object->team) and !in_array($laneID, array_keys($object->team), true)) continue;
module/upgrade/model.php
+27
View File
@@ -543,6 +543,9 @@ class upgradeModel extends model
}
}
break;
case '17_5':
$this->recordOSAndBrowserOfBug();
break;
}
$this->deletePatch();
@@ -7089,4 +7092,28 @@ class upgradeModel extends model
return $result->rowCount() > 0;
}
/**
* Record OS and browser of bug.
*
* @access public
* @return bool
*/
public function recordOSAndBrowserOfBug()
{
$existOSList = $this->dao->select('distinct os')->from(TABLE_BUG)->where('os')->ne('')->fetchPairs();
$existBrowserList = $this->dao->select('distinct browser')->from(TABLE_BUG)->where('os')->ne('')->fetchPairs();
$deletedOSList = array('vista', 'win2012', 'win2008', 'win2003', 'win2000', 'wp8', 'wp7', 'symbian', 'freebsd');
$deletedBrowserList = array('ie7', 'ie6', 'firefox4', 'firefox3', 'firefox2', 'oprea11', 'oprea10', 'oprea9', 'maxthon', 'uc');
$existList = array_merge($existOSList, $existBrowserList);
$deletedList = array_merge($deletedOSList, $deletedBrowserList);
foreach($deletedList as $deletedLang)
{
if(in_array($deletedLang, $existList)) continue;
$this->dao->delete()->from(TABLE_LANG)->where('module')->eq('bug')->andWhere('`key`')->eq($deletedLang)->andWhere('system')->eq(1)->andWhere('vision')->eq('rnd')->exec();
}
return true;
}
}