diff options
| author | Egil Moeller <egil.moller@freecode.no> | 2010-03-30 20:14:16 +0200 |
|---|---|---|
| committer | Egil Moeller <egil.moller@freecode.no> | 2010-03-30 20:14:16 +0200 |
| commit | dbeb378898c79a1326b8b3d02c5bfd3c5d0a9586 (patch) | |
| tree | 94ccfc73b37c6b40fe933df3cc70f95e34b56d6f | |
| parent | 4a8ada694fe8cab6380df9fd84a68d7dbe56f5b3 (diff) | |
| download | etherpad-dbeb378898c79a1326b8b3d02c5bfd3c5d0a9586.tar.gz etherpad-dbeb378898c79a1326b8b3d02c5bfd3c5d0a9586.tar.bz2 etherpad-dbeb378898c79a1326b8b3d02c5bfd3c5d0a9586.zip | |
Bugfix for plugin manager
| -rw-r--r-- | etherpad/src/etherpad/control/admin/pluginmanager.js | 2 | ||||
| -rw-r--r-- | etherpad/src/templates/admin/pluginmanager.ejs | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/etherpad/src/etherpad/control/admin/pluginmanager.js b/etherpad/src/etherpad/control/admin/pluginmanager.js index e293592..39edc4a 100644 --- a/etherpad/src/etherpad/control/admin/pluginmanager.js +++ b/etherpad/src/etherpad/control/admin/pluginmanager.js @@ -54,8 +54,6 @@ function onRequest() { renderHtml("admin/pluginmanager.ejs", { - pluginModules: plugins.pluginModules, - plugins: plugins.plugins, config: appjet.config, bodyClass: 'nonpropad', isPro: pro_utils.isProDomainRequest(), diff --git a/etherpad/src/templates/admin/pluginmanager.ejs b/etherpad/src/templates/admin/pluginmanager.ejs index 4e08fc9..33b04bf 100644 --- a/etherpad/src/templates/admin/pluginmanager.ejs +++ b/etherpad/src/templates/admin/pluginmanager.ejs @@ -93,18 +93,18 @@ limitations under the License. */ %> <th>Status</th> <th></th> </tr> - <% for (var plugin in pluginModules) { %> + <% for (var plugin in plugins.pluginModules) { %> <tr> - <td><%= pluginModules[plugin].description %></td> + <td><%= plugins.pluginModules[plugin].description %></td> <td> - <% if (plugins[plugin] !== undefined) { %> + <% if (plugins.plugins[plugin] !== undefined) { %> Installed <% } else { %> Not installed <% } %> </td> <td> - <% if (plugins[plugin] !== undefined) { %> + <% if (plugins.plugins[plugin] !== undefined) { %> <a href="/ep/admin/pluginmanager/?plugin=<%= plugin %>&action=uninstall">Uninstall</a> <a href="/ep/admin/pluginmanager/?plugin=<%= plugin %>&action=reinstall">Reinstall</a> <% } else { %> |