Version Notes
Typo fixes, properly aborts ajax requests.
Download this release
Release Info
Developer | Alan Storm |
Extension | Pulsestorm_Launcher |
Version | 1.0.4 |
Comparing to | |
See all releases |
Code changes from version 1.0.3 to 1.0.4
- app/code/community/Pulsestorm/Launcher/Model/Observer.php +5 -2
- app/code/community/Pulsestorm/Launcher/controllers/Pulsestorm/LauncherController.php +12 -0
- app/code/community/Pulsestorm/Launcher/etc/config.xml +12 -1
- app/design/adminhtml/default/default/template/pulsestorm_launcher/js-nav.phtml +3 -3
- package.xml +1 -1
app/code/community/Pulsestorm/Launcher/Model/Observer.php
CHANGED
@@ -108,7 +108,7 @@ class Pulsestorm_Launcher_Model_Observer
|
|
108 |
|
109 |
$url = Mage::getModel('adminhtml/url');
|
110 |
$search = new stdClass();
|
111 |
-
$search->url = $url->getUrl('adminhtml/
|
112 |
$search = Mage::helper('core')->jsonEncode($search);
|
113 |
|
114 |
$block = $layout->createBlock('adminhtml/template')
|
@@ -181,7 +181,10 @@ class Pulsestorm_Launcher_Model_Observer
|
|
181 |
|
182 |
protected function _shouldBail($controller)
|
183 |
{
|
184 |
-
|
|
|
|
|
|
|
185 |
$controller->getRequest()->isAjax();
|
186 |
}
|
187 |
|
108 |
|
109 |
$url = Mage::getModel('adminhtml/url');
|
110 |
$search = new stdClass();
|
111 |
+
$search->url = $url->getUrl('adminhtml/pulsestorm_launcher/globalSearch');
|
112 |
$search = Mage::helper('core')->jsonEncode($search);
|
113 |
|
114 |
$block = $layout->createBlock('adminhtml/template')
|
181 |
|
182 |
protected function _shouldBail($controller)
|
183 |
{
|
184 |
+
// Ensure the layout area is 'adminhtml' because the CMS preview uses 'frontend',
|
185 |
+
// and since the frontend page has a different breadcrumbs block, we'll get an exception.
|
186 |
+
return $controller->getLayout()->getArea() !== 'adminhtml' ||
|
187 |
+
strpos($controller->getFullActionName(), 'adminhtml_') !== 0 ||
|
188 |
$controller->getRequest()->isAjax();
|
189 |
}
|
190 |
|
app/code/community/Pulsestorm/Launcher/controllers/Pulsestorm/LauncherController.php
ADDED
@@ -0,0 +1,12 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
require_once 'Mage/Adminhtml/controllers/IndexController.php';
|
3 |
+
class Pulsestorm_Launcher_Pulsestorm_LauncherController extends Mage_Adminhtml_IndexController
|
4 |
+
{
|
5 |
+
public function globalSearchAction()
|
6 |
+
{
|
7 |
+
//end session to avoid locking problems
|
8 |
+
//https://github.com/astorm/Pulsestorm/issues/22#issuecomment-17904578
|
9 |
+
session_write_close();
|
10 |
+
return parent::globalSearchAction();
|
11 |
+
}
|
12 |
+
}
|
app/code/community/Pulsestorm/Launcher/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Pulsestorm_Launcher>
|
5 |
-
<version>1.0.
|
6 |
</Pulsestorm_Launcher>
|
7 |
</modules>
|
8 |
<frontend>
|
@@ -16,6 +16,17 @@
|
|
16 |
</pulsestorm_launcher>
|
17 |
</routers>
|
18 |
</frontend>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
19 |
<global>
|
20 |
<blocks>
|
21 |
<pulsestorm_launcher>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Pulsestorm_Launcher>
|
5 |
+
<version>1.0.4</version>
|
6 |
</Pulsestorm_Launcher>
|
7 |
</modules>
|
8 |
<frontend>
|
16 |
</pulsestorm_launcher>
|
17 |
</routers>
|
18 |
</frontend>
|
19 |
+
<admin>
|
20 |
+
<routers>
|
21 |
+
<adminhtml>
|
22 |
+
<args>
|
23 |
+
<modules>
|
24 |
+
<Pulsestorm_Launcher after="Mage_Adminhtml">Pulsestorm_Launcher</Pulsestorm_Launcher>
|
25 |
+
</modules>
|
26 |
+
</args>
|
27 |
+
</adminhtml>
|
28 |
+
</routers>
|
29 |
+
</admin>
|
30 |
<global>
|
31 |
<blocks>
|
32 |
<pulsestorm_launcher>
|
app/design/adminhtml/default/default/template/pulsestorm_launcher/js-nav.phtml
CHANGED
@@ -57,7 +57,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|
57 |
//console.log("No anchor found");
|
58 |
return;
|
59 |
}
|
60 |
-
document.location = a[0].href;
|
61 |
}
|
62 |
|
63 |
var up = function()
|
@@ -212,7 +212,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|
212 |
while(old_search = search_requests.pop())
|
213 |
{
|
214 |
old_search.transport.abort();
|
215 |
-
console.log("aborting");
|
216 |
}
|
217 |
}
|
218 |
|
@@ -247,7 +247,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|
247 |
});
|
248 |
}
|
249 |
});
|
250 |
-
|
251 |
search_requests.push(search_request);
|
252 |
|
253 |
}, 100);
|
57 |
//console.log("No anchor found");
|
58 |
return;
|
59 |
}
|
60 |
+
document.location = a[0].href;
|
61 |
}
|
62 |
|
63 |
var up = function()
|
212 |
while(old_search = search_requests.pop())
|
213 |
{
|
214 |
old_search.transport.abort();
|
215 |
+
// console.log("aborting");
|
216 |
}
|
217 |
}
|
218 |
|
247 |
});
|
248 |
}
|
249 |
});
|
250 |
+
// console.log("starting search request");
|
251 |
search_requests.push(search_request);
|
252 |
|
253 |
}, 100);
|
package.xml
CHANGED
@@ -1,2 +1,2 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
-
<package><name>Pulsestorm_Launcher</name><version>1.0.
|
1 |
<?xml version="1.0"?>
|
2 |
+
<package><name>Pulsestorm_Launcher</name><version>1.0.4</version><stability>stable</stability><license>MIT</license><channel>community</channel><extends></extends><summary>Provides navigation shortcuts for the admin console's navigation and gloal search</summary><description>This extension provides Magento admin console users with an "application launcher". This application launcher provides instant access to the admin console's navigation, every system configuration search section, as well as the Magento global search. The Pulse Storm launcher is a free, open source, must have extension for anyone working with Magento. </description><notes>Typo fixes, properly aborts ajax requests.</notes><authors><author><name>Alan Storm</name><user>alanstorm</user><email>astorm@alanstorm.com</email></author></authors><date>2013-06-12</date><time>10:47:47</time><compatible></compatible><dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies><contents><target name="mage"><dir name="app"><dir name="code"><dir name="community"><dir name="Pulsestorm"><dir name="Launcher"><file name="README.md" hash="6593ef7d7685f05fd806828a9a0593ce"/><dir name="Block"><file name="Breadcrumbs.php" hash="17f7faf76b226c9351f02d22a5ff44d5"/><dir name="Page"><file name="Menu.php" hash="9e2086c0e2f7b7d1f47d3bc071d75da1"/></dir></dir><dir name="controllers"><dir name="Pulsestorm"><file name="LauncherController.php" hash="27aa93e7a772608537e26f602fad348c"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="10ad3abbcfed784a909080b735d7a7fc"/><file name="config.xml" hash="c8144fd49159954fb7a4bbc06f8eed78"/><file name="system.xml" hash="2034bd9b0cb236974d037231e0739f3b"/></dir><dir name="Helper"><file name="Data.php" hash="1fc4917e3807911e9d7b6601aeeda82d"/></dir><dir name="Model"><file name="Links.php" hash="d0f545b5e5a1c1fb17ef0046a3d53bb7"/><file name="Observer.php" hash="537c1a3a077fbaf3f9bea085999a3ac6"/></dir></dir></dir></dir></dir><dir name="design"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="pulsestorm_launcher"><file name="hook.phtml" hash="448893b714d310dc1a573dcdc262d650"/><file name="js-nav.phtml" hash="e98d0dd61ac2f4a230e4c8121f05823e"/></dir></dir></dir></dir></dir></dir><dir name="etc"><dir name="modules"><file name="Pulsestorm_Launcher.xml" hash="39d02d974ef2ad1d970e9fcb83ccdff8"/></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="pulsestorm_launcher"><file name="main.css" hash="a6c225a68bc2a6e61b2d7b8e1e0220bd"/></dir></dir></dir></dir></dir></target></contents></package>
|