From: Michael Andreen <harv@ruin.nu>
Date: Wed, 9 May 2007 09:21:49 +0000 (+0000)
Subject: checkbox to remove targets
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;ds=inline;h=a7428ba34cb5ee5e516fd714d152670eb51d8eb4;p=ndwebbie.git

checkbox to remove targets
---

diff --git a/ND/Web/Pages/EditRaid.pm b/ND/Web/Pages/EditRaid.pm
index 16eab5e..4ed3981 100644
--- a/ND/Web/Pages/EditRaid.pm
+++ b/ND/Web/Pages/EditRaid.pm
@@ -140,6 +140,7 @@ sub render_body {
 			my $comment = $DBH->prepare(q{UPDATE raid_targets SET comment = ? WHERE id = ?});
 			my $unclaim =  $DBH->prepare(q{DELETE FROM raid_claims WHERE target = ? AND wave = ?});
 			my $block = $DBH->prepare(q{INSERT INTO raid_claims (target,uid,wave) VALUES(?,-2,?)});
+			my $remove = $DBH->prepare(q{DELETE FROM raid_targets WHERE raid = ? AND id = ?});
 			for $_ (param()){
 				if (/^comment:(\d+)$/){
 					$comment->execute(escapeHTML(param($_)),$1) or $error .= p($DBH->errstr);
@@ -148,18 +149,12 @@ sub render_body {
 					log_message $ND::UID,"BC unclaimed target $1 wave $2.";
 				}elsif(/^block:(\d+):(\d+)$/){
 					$block->execute($1,$2) or $error .= p($DBH->errstr);
+				}elsif(/^remove:(\d+)$/){
+					$remove->execute($raid->{id},$1) or $error .= p($DBH->errstr);
 				}
 			}
 			$DBH->commit or $error .= p($DBH->errstr);
 		}
-
-	}
-	if ($raid && param('removeTarget')){
-		$error .= "test";
-		unless($DBH->do(q{DELETE FROM raid_targets WHERE raid = ? AND id = ?}
-				,undef,$raid->{id},param('removeTarget'))){
-			$error .= "<p> Something went wrong: ".$DBH->errstr."</p>";
-		}
 	}
 
 	my $groups = $DBH->prepare(q{SELECT g.gid,g.groupname,raid FROM groups g LEFT OUTER JOIN (SELECT gid,raid FROM raid_access WHERE raid = ?) AS ra ON g.gid = ra.gid WHERE g.attack});
@@ -202,7 +197,7 @@ sub render_body {
 			$order = "$1 DESC";
 		}
 
-		my $targetquery = $DBH->prepare(qq{SELECT r.id,coords(x,y,z),raid,comment,size,score,value,race,planet_status AS planetstatus,relationship,comment,r.planet
+		my $targetquery = $DBH->prepare(qq{SELECT r.id,coords(x,y,z),comment,size,score,value,race,planet_status AS planetstatus,relationship,comment,r.planet
 			FROM current_planet_stats p JOIN raid_targets r ON p.id = r.planet 
 			WHERE r.raid = ?
 			ORDER BY $order});
diff --git a/templates/editRaid.tmpl b/templates/editRaid.tmpl
index e0ab28a..6c9f277 100644
--- a/templates/editRaid.tmpl
+++ b/templates/editRaid.tmpl
@@ -2,6 +2,7 @@
 <form action="<TMPL_VAR NAME=PAGE>" method="post">
 	<fieldset> <legend><TMPL_IF Raid>Edit raid<TMPL_ELSE>New raid</TMPL_IF></legend>
 		<input type="hidden" name="page" value="<TMPL_VAR NAME=PAGE>"/>
+		<input type="hidden" name="raid" value="<TMPL_VAR NAME=Raid>"/>
 		<div class="leftinfo">
 		<TMPL_IF Raid>
 			<input type="hidden" name="cmd" value="change"/>
@@ -69,6 +70,7 @@
 <TMPL_LOOP Targets>
 	<fieldset> <legend>Target: #<TMPL_VAR NAME=Id> <TMPL_VAR NAME=Coords></legend>
 	<div class="leftinfo">
+	<p style="color:red;font-weight:bold">Remove target: <input type="checkbox" name="remove:<TMPL_VAR NAME=Id>" value="remove"/></p>
 		<ul>
 			<li>Size: <TMPL_VAR NAME=Size></li>
 			<li>Score: <TMPL_VAR NAME=Score></li>
@@ -89,7 +91,6 @@
 			<p>Block wave <TMPL_VAR NAME=Wave>: <input type="checkbox" name="block:<TMPL_VAR NAME=Id>:<TMPL_VAR NAME=Wave>" value="block"/></p>
 		</TMPL_IF>
 	</TMPL_LOOP>
-	<p><a href="/<TMPL_VAR NAME=PAGE>?raid=<TMPL_VAR NAME=Raid>&amp;removeTarget=<TMPL_VAR NAME=Id>">Remove</a></p>
 	</div>
 	<div class="leftinfo">
 	<p>	Comment:<br/>