Fix 500 for empty plugins

This commit is contained in:
Alex Ling 2020-07-29 10:07:10 +00:00
parent 6e9466c9d2
commit 22a660aabf
2 changed files with 10 additions and 7 deletions

View File

@ -82,10 +82,11 @@ class MainRouter < Router
begin begin
id = env.params.query["plugin"]? id = env.params.query["plugin"]?
plugins = Plugin.list plugins = Plugin.list
plugin = nil
if id if id
plugin = Plugin.new id plugin = Plugin.new id
else elsif !plugins.empty?
plugin = Plugin.new plugins[0][:id] plugin = Plugin.new plugins[0][:id]
end end

View File

@ -1,6 +1,6 @@
<% if plugins.empty? %> <% if plugins.empty? %>
<div class="uk-container uk-text-center"> <div class="uk-container uk-text-center">
<h2>No Plugins found</h2> <h2>No Plugins Found</h2>
<p>We could't find any plugins in the directory <code><%= Config.current.plugin_path %></code>.</p> <p>We could't find any plugins in the directory <code><%= Config.current.plugin_path %></code>.</p>
<p>You can download official plugins from the <a href="https://github.com/hkalexling/mango-plugins">Mango plugins repository</a>.</p> <p>You can download official plugins from the <a href="https://github.com/hkalexling/mango-plugins">Mango plugins repository</a>.</p>
</div> </div>
@ -13,7 +13,7 @@
<div class="uk-margin"> <div class="uk-margin">
<label class="uk-form-label" for="search-input">&nbsp;</label> <label class="uk-form-label" for="search-input">&nbsp;</label>
<div class="uk-form-controls"> <div class="uk-form-controls">
<input id="search-input" class="uk-input" type="text" placeholder="<%= plugin.info.placeholder %>"> <input id="search-input" class="uk-input" type="text" placeholder="<%= plugin.not_nil!.info.placeholder %>">
</div> </div>
</div> </div>
</div> </div>
@ -40,7 +40,7 @@
</div> </div>
<dl class="uk-description-list" id="toggle" hidden> <dl class="uk-description-list" id="toggle" hidden>
<% plugin.info.each do |k, v| %> <% plugin.not_nil!.info.each do |k, v| %>
<dt><%= k %></dt> <dt><%= k %></dt>
<dd><%= v.to_s %></dd> <dd><%= v.to_s %></dd>
<% end %> <% end %>
@ -63,9 +63,11 @@
<% content_for "script" do %> <% content_for "script" do %>
<script> <% if plugin %>
var pid = "<%= plugin.info.id %>"; <script>
</script> var pid = "<%= plugin.not_nil!.info.id %>";
</script>
<% end %>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/js/jquery.tablesorter.combined.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.tablesorter/2.31.3/js/jquery.tablesorter.combined.min.js"></script>
<script src="<%= base_url %>js/alert.js"></script> <script src="<%= base_url %>js/alert.js"></script>