Alexander Nicolaysen Sørnes : application_queue: Show a link for merging with any app when processing entries

[Alexander Nicolaysen Sørnes]

Module: appdb
Branch: master
Commit: fcf23ec690b71eab7f9400dc61dc1fa7bf8d367d
URL:    http://source.winehq.org/git/appdb.git/?a=commit;h=fcf23ec690b71eab7f9400dc61dc1fa7bf8d367d

Author: Alexander Nicolaysen Sørnes <alexander at linux-xqqm.(none)>
Date:   Sun Dec 13 21:23:14 2009 +0100

application_queue: Show a link for merging with any app when processing entries

---

 include/application_queue.php |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/include/application_queue.php b/include/application_queue.php
index 44d4901..b1bdc69 100644
--- a/include/application_queue.php
+++ b/include/application_queue.php
@@ -295,6 +295,14 @@ class application_queue
         echo "<br />\n";
         echo "<b>Partial matches</b><br />\n";
         $this->displayDuplicateTable(searchForApplicationPartial($this->oApp->sName, $this->oApp->objectGetId()));
+        echo '<br /><br />';
+        if($this->oApp->iAppId && $this->oApp->canEdit())
+        {
+            echo "<a href=\"objectManager.php?sClass=application&amp;".
+                 "bIsQueue=true&amp;sAction=showMoveChildren&amp;iId=".
+                 $this->oApp->iAppId.
+                 "\">Merge with another application</a>";
+        }
     }
 
     function displayDuplicateTable($hResult)