Bug when merging applications

[Tony Lambregts]

Jonathan Ernst wrote:

>Hi,
>
>Try to merge the newly submitted Fritz with the old one and you'll get
>an "application not found" error.
>
>  
>
Fix for this

Change Log: Allow the merging of versions into exisiting applications again.

Files changed admin/adminAppQueue.php


-------------- next part --------------
Index: admin/adminAppQueue.php
===================================================================
RCS file: /home/wine/appdb/admin/adminAppQueue.php,v
retrieving revision 1.48
diff -u -r1.48 adminAppQueue.php
--- admin/adminAppQueue.php	30 Oct 2005 22:27:14 -0000	1.48
+++ admin/adminAppQueue.php	11 Nov 2005 17:22:58 -0000
@@ -46,7 +46,7 @@
             //display row
             echo "<tr class=$bgcolor>\n";
             /* map the merging of the current app to the app we are displaying in the table */
-            echo "    <td>".html_ahref($ob->appName,"adminAppQueue.php?sub=duplicate&appId=".$currentAppId."&appIdMergeTo=".$ob->appId)."</td>\n";
+            echo "    <td>".html_ahref($ob->appName,"adminAppQueue.php?sub=duplicate&apptype=application&appId=".$currentAppId."&appIdMergeTo=".$ob->appId)."</td>\n";
             echo "    <td>$y->versions versions &nbsp;</td>\n";
             echo "</tr>\n\n";
 
@@ -172,9 +172,10 @@
             /* move this version submission under the existing app */
             $oVersion->iAppId = $_REQUEST['appIdMergeTo'];
             $oVersion->update();
-        
+
             /* delete the appId that is the duplicate */
-            $oApp->delete();
+            $oAppDelete = new Application($oApp->iAppId);
+            $oAppDelete->delete();
         }
 
         /* redirect back to the main page */