claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merging of versions into existing applications

Browse Source
This commit is contained in:
Tony Lambregts
2005-11-12 03:06:55 +00:00
committed by WineHQ
parent b7a68c68e2
commit 3efdcb188c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
admin/adminAppQueue.php
View File

@@ -46,7 +46,7 @@ function outputSearchTableForDuplicateFlagging($currentAppId, $hResult)
//display row //display row
echo "<tr class=$bgcolor>\n"; echo "<tr class=$bgcolor>\n";
/* map the merging of the current app to the app we are displaying in the table */ /* 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 " <td>$y->versions versions &nbsp;</td>\n";
echo "</tr>\n\n"; echo "</tr>\n\n";
@@ -172,9 +172,10 @@ if ($_REQUEST['sub'])
/* move this version submission under the existing app */ /* move this version submission under the existing app */
$oVersion->iAppId = $_REQUEST['appIdMergeTo']; $oVersion->iAppId = $_REQUEST['appIdMergeTo'];
$oVersion->update(); $oVersion->update();
/* delete the appId that is the duplicate */ /* delete the appId that is the duplicate */
$oApp->delete(); $oAppDelete = new Application($oApp->iAppId);
$oAppDelete->delete();
} }
/* redirect back to the main page */ /* redirect back to the main page */