diff --git a/VERSION b/VERSION index 072e6075b0..aca1f7a170 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.0.beta +10.0.alpha diff --git a/config/config.php b/config/config.php index 29b8779a8b..e0fdaa0492 100644 --- a/config/config.php +++ b/config/config.php @@ -16,7 +16,7 @@ if(!class_exists('config')){class config{}} if(!function_exists('getWebRoot')){function getWebRoot(){}} /* 基本设置。Basic settings. */ -$config->version = '10.0.beta'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. +$config->version = '10.0.alpha'; // ZenTaoPHP的版本。 The version of ZenTaoPHP. Don't change it. $config->charset = 'UTF-8'; // ZenTaoPHP的编码。 The encoding of ZenTaoPHP. $config->cookieLife = time() + 2592000; // Cookie的生存时间。The cookie life time. $config->timezone = 'Asia/Shanghai'; // 时区设置。 The time zone setting, for more see http://www.php.net/manual/en/timezones.php. diff --git a/db/update10.0.beta.sql b/db/update9.8.3.sql similarity index 100% rename from db/update10.0.beta.sql rename to db/update9.8.3.sql diff --git a/module/project/js/managemembers.js b/module/project/js/managemembers.js index c3b51f2dad..82257a19d8 100644 --- a/module/project/js/managemembers.js +++ b/module/project/js/managemembers.js @@ -13,11 +13,11 @@ function setRole(account, roleID) roleOBJ.val(role) // set the role. } -function addItem() +function addItem(obj) { var item = $('#addItem').html().replace(/%i%/g, i); - $('#teamForm table tbody').append('' + item + ''); - var accounts = $('#submit').closest('table').find('tr.addedItem:last').find('select:first') + $(obj).closest('tr').after('' + item + ''); + var accounts = $('#hours' + i).closest('tr').find('select:first') accounts.trigger('liszt:updated'); accounts.chosen(); i ++; diff --git a/module/project/view/managemembers.html.php b/module/project/view/managemembers.html.php index ecf3a99786..c0efa66c44 100644 --- a/module/project/view/managemembers.html.php +++ b/module/project/view/managemembers.html.php @@ -58,8 +58,7 @@ team->limitedList, $member->limited);?> - - + @@ -76,7 +75,7 @@ team->limitedList, 'no');?> - + @@ -95,7 +94,7 @@ team->limitedList, 'no');?> - + @@ -114,15 +113,15 @@ team->limitedList, 'no');?> - + + - @@ -139,7 +138,7 @@ team->limitedList, $member->realname ? $member->limited : 'no');?> - + diff --git a/module/project/view/team.html.php b/module/project/view/team.html.php index 900981e28c..a52de7a8c0 100644 --- a/module/project/view/team.html.php +++ b/module/project/view/team.html.php @@ -31,7 +31,7 @@
-
+