mirror of https://github.com/BOINC/boinc.git
- user web: if join team while already in a team,
create outgoing delta also svn path=/trunk/boinc/; revision=14244
This commit is contained in:
parent
3a6ef1d42b
commit
c9429ad7a4
|
@ -11205,3 +11205,14 @@ David 17 Nov 2007
|
|||
|
||||
html/user/
|
||||
edit_forum_preferences_action.php
|
||||
|
||||
David 17 Nov 2007
|
||||
- user web: if join team while already in a team,
|
||||
create outgoing delta also
|
||||
|
||||
html/
|
||||
inc/
|
||||
host.inc
|
||||
team.inc
|
||||
user/
|
||||
team_join.php
|
||||
|
|
|
@ -321,7 +321,7 @@ function hosts_compatible($host1, $host2) {
|
|||
//
|
||||
if ($host1->total_credit && $host2->total_credit) {
|
||||
if (!times_disjoint($host1, $host2)) {
|
||||
echo "<br>h2 $host2->create_time $host2->rpc_time";
|
||||
//echo "<br>h2 $host2->create_time $host2->rpc_time";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -296,6 +296,7 @@ function show_team_row($team, $i) {
|
|||
}
|
||||
|
||||
function user_join_team($team, $user) {
|
||||
user_quit_team($user);
|
||||
$res = $user->update("teamid=$team->id");
|
||||
if ($res) {
|
||||
$now = time();
|
||||
|
|
|
@ -11,7 +11,7 @@ $teamid = get_int("teamid");
|
|||
$team = BoincTeam::lookup_id($teamid);
|
||||
require_team($team);
|
||||
if ($user->teamid == $team->id) {
|
||||
page_head("Unable to add $user->name");
|
||||
page_head("Already a member");
|
||||
echo "You are already a member of $team->name.";
|
||||
} else {
|
||||
$success = user_join_team($team, $user);
|
||||
|
|
Loading…
Reference in New Issue