From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 17 Jun 2011 14:20:54 +0000 (+0000)
Subject: luci-0.10: merge r7170
X-Git-Tag: 0.10.0~117
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=40180a32e2e3c0323edbee33f58fd806698baa73;p=oweals%2Fluci.git

luci-0.10: merge r7170
---

diff --git a/modules/admin-full/luasrc/view/admin_system/packages.htm b/modules/admin-full/luasrc/view/admin_system/packages.htm
index 854dedfba..51c50500a 100644
--- a/modules/admin-full/luasrc/view/admin_system/packages.htm
+++ b/modules/admin-full/luasrc/view/admin_system/packages.htm
@@ -37,6 +37,8 @@ local space_used  = space_total - space_free
 local used_perc = math.floor(0.5 + ((space_total > 0) and ((100 / space_total) * space_used) or 100))
 local free_byte = space_free * fstat.frsize
 
+local filter = { }
+
 -%>
 <%+header%>
 <h2><a id="content" name="content"><%:System%> - <%:Software%></a></h2>
@@ -103,7 +105,7 @@ local free_byte = space_free * fstat.frsize
 					<th class="cbi-section-table-cell" style="text-align:left"><%:Package name%></th>
 					<th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th>
 				</tr>
-				<% local empty = true; luci.model.ipkg.list_installed(query, function(n, v, d) empty = false %>
+				<% local empty = true; luci.model.ipkg.list_installed(query, function(n, v, d) empty = false; filter[n] = true %>
 				<tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
 					<td style="text-align:left; width:10%"><a onclick="return window.confirm('<%:Remove%> &quot;<%=luci.util.pcdata(n)%>&quot; ?')" href="<%=REQUEST_URI%>?submit=1&amp;remove=<%=luci.util.pcdata(n)%>"><%:Remove%></a></td>
 					<td style="text-align:left"><%=luci.util.pcdata(n)%></td>
@@ -132,7 +134,7 @@ local free_byte = space_free * fstat.frsize
 					<th class="cbi-section-table-cell" style="text-align:left"><%:Version%></th>
 					<th class="cbi-section-table-cell" style="text-align:left"><%:Description%></th>
 				</tr>
-				<% local empty = true; luci.model.ipkg.list_all(query, function(n, v, d) empty = false %>
+				<% local empty = true; luci.model.ipkg.list_all(query, function(n, v, d) if filter[n] then return end; empty = false %>
 				<tr class="cbi-section-table-row cbi-rowstyle-<%=rowstyle()%>">
 					<td style="text-align:left; width:10%"><a onclick="return window.confirm('<%:Install%> &quot;<%=luci.util.pcdata(n)%>&quot; ?')" href="<%=REQUEST_URI%>?submit=1&amp;install=<%=luci.util.pcdata(n)%>"><%:Install%></a></td>
 					<td style="text-align:left"><%=luci.util.pcdata(n)%></td>