Fix merging of versions into existing applications
This commit is contained in:
@@ -46,7 +46,7 @@ function outputSearchTableForDuplicateFlagging($currentAppId, $hResult)
|
||||
//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 </td>\n";
|
||||
echo "</tr>\n\n";
|
||||
|
||||
@@ -174,7 +174,8 @@ if ($_REQUEST['sub'])
|
||||
$oVersion->update();
|
||||
|
||||
/* delete the appId that is the duplicate */
|
||||
$oApp->delete();
|
||||
$oAppDelete = new Application($oApp->iAppId);
|
||||
$oAppDelete->delete();
|
||||
}
|
||||
|
||||
/* redirect back to the main page */
|
||||
|
||||
Reference in New Issue
Block a user