[Git][noosfero/noosfero][stable-1.7] Merge branch 'disabled-asset' into 'master'
Rodrigo Souto
gitlab at mg.gitlab.com
Mon Jan 23 15:28:00 BRST 2017
Rodrigo Souto pushed to branch stable-1.7 at Noosfero / noosfero
Commits:
aa58e3c6 by Rodrigo Souto at 2017-01-23T17:19:08+00:00
Merge branch 'disabled-asset' into 'master'
search: not display disabled asset
See merge request !1083
- - - - -
1 changed file:
- app/views/search/_display_results.html.erb
Changes:
=====================================
app/views/search/_display_results.html.erb
=====================================
--- a/app/views/search/_display_results.html.erb
+++ b/app/views/search/_display_results.html.erb
@@ -2,6 +2,8 @@
<% @assets.each do |name| %>
<% search = @searches[name] %>
+ <% next if environment.enabled?("disable_asset_#{name}") %>
+
<div class="search-results-<%= name %> search-results-box <%= "search-results-empty" if search[:results].blank? %>">
<% if !search[:results].blank? %>
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/aa58e3c6ca9f628d284d048512de96a88d6e26d4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170123/5da77d79/attachment-0001.html>
More information about the Noosfero-dev
mailing list