Mercurial > epgrec.yaz

changeset 162:c6c6bd734f18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix: ????
author epgrec@park.mda.or.jp <yoneda@recorder.localnet.mda.or.jp>
date Sun, 04 Apr 2010 18:14:47 +0900
parents 84220382fea8
children b3095425e613
files cancelReservation.php templates/recordedTable.html
diffstat 2 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/cancelReservation.php	Sun Apr 04 17:10:17 2010 +0900
+++ b/cancelReservation.php	Sun Apr 04 18:14:47 2010 +0900
@@ -19,6 +19,12 @@
 	try {
 		$rec = new DBRecord( RESERVE_TBL, "id" , $reserve_id );
 		$program_id = $rec->program_id;
+		
+		if( isset( $_GET['delete_file'] ) ) {
+			if( $_GET['delete_file'] == 1 ) {
+				$path = INSTALL_PATH."/".$settings->spool."/".$rec->path;
+			}
+		}
 	}
 	catch( Exception $e ) {
 		// 無視
@@ -35,13 +41,7 @@
 		// 無視
 	}
 }
-if( $rec == null ) exit( "Error: 予約レコードが取得出来ません" );
 
-if( isset( $_GET['delete_file'] ) ) {
-	if( $_GET['delete_file'] == 1 ) {
-		$path = INSTALL_PATH."/".$settings->spool."/".$rec->path;
-	}
-}
 
 
 // 予約取り消し実行
--- a/templates/recordedTable.html	Sun Apr 04 17:10:17 2010 +0900
+++ b/templates/recordedTable.html	Sun Apr 04 18:14:47 2010 +0900
@@ -37,6 +37,7 @@
 					alert(data);
 				}
 				else {
+//					alert(data);
 					$('#resid_' + id ).hide();
 					$('#floatBox4Dialog').dialog('close');
 				}