4 files changed, 16 insertions, 5 deletions
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php
index c1852009..84e430e2 100644
--- a/modules/digibug/controllers/digibug.php
+++ b/modules/digibug/controllers/digibug.php
@@ -55,7 +55,7 @@ class Digibug_Controller extends Controller {
   }
 
   public function print_proxy($type, $id) {
-    $proxy = ORM::factory("digibug_proxy", array("uuid", $id));
+    $proxy = ORM::factory("digibug_proxy", array("uuid" => $id));
     if (!$proxy->loaded || !$proxy->item->loaded) {
       Kohana::show_404();
     }
diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php
index 4b8db5a2..f1d4fc1d 100644
--- a/modules/digibug/helpers/digibug_menu.php
+++ b/modules/digibug/helpers/digibug_menu.php
@@ -32,8 +32,7 @@ class digibug_menu {
       Menu::factory("link")
       ->id("digibug")
       ->label(t("Print with Digibug"))
-      ->url("javascript:digibug_popup('" .
-            url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')")
+      ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
       ->css_id("gDigibugLink"));
   }
 
@@ -43,8 +42,7 @@ class digibug_menu {
         Menu::factory("link")
         ->id("digibug")
         ->label(t("Print with Digibug"))
-        ->url("javascript:digibug_popup('" .
-              url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')")
+        ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf"))
         ->css_id("gDigibugLink"));
     }
   }
diff --git a/modules/digibug/js/digibug.js b/modules/digibug/js/digibug.js
index 78ca8cf3..30bff47d 100644
--- a/modules/digibug/js/digibug.js
+++ b/modules/digibug/js/digibug.js
@@ -1,3 +1,15 @@
+$(document).ready(function() {
+  $(".gDigibugPrintButton a").click(function(e) {
+    e.preventDefault();
+    return digibug_popup(e.currentTarget.href, { width: 800, height: 600 } );
+  });
+
+  $("#gDigibugLink").click(function(e) {
+    e.preventDefault();
+    return digibug_popup(e.currentTarget.href, { width: 800, height: 600 } );
+  });
+});
+
 function digibug_popup(url, options) {
   options = $.extend({
     /* default options */
diff --git a/modules/digibug/models/digibug_proxy.php b/modules/digibug/models/digibug_proxy.php
index 036af9c7..c76afdae 100644
--- a/modules/digibug/models/digibug_proxy.php
+++ b/modules/digibug/models/digibug_proxy.php
@@ -18,4 +18,5 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class Digibug_Proxy_Model extends ORM {
+  protected $has_one = array("item");
 }