Download as
Browse Code »

Commit aa9dccef4e1efaf29f4ed04bd0d59a5a9c28895d

Authored by Leandro Santos
2 parents 6442ffa5 da29b595
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge branch 'master' of gitlab.com:noosfero/noosfero

Showing 3 changed files with 12 additions and 4 deletions   Show diff stats
app/views/layouts/application-ng.html.erb
  Diff comments   View file @aa9dcce
@@ -6,6 +6,10 @@ @@ -6,6 +6,10 @@
6 <!--<meta http-equiv="refresh" content="1"/>--> 6 <!--<meta http-equiv="refresh" content="1"/>-->
7 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> 7 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
8 8
  9 + <% unless defined? MetadataPlugin and environment.enabled_plugins.include? 'MetadataPlugin' %>
  10 + <meta name="description" content="<%= @environment.name %>" />
  11 + <% end %>
  12 +
9 <!-- site root --> 13 <!-- site root -->
10 <meta property="noosfero:root" content="<%= Noosfero.root %>"/> 14 <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
11 15
plugins/metadata/lib/ext/environment.rb
  Diff comments   View file @aa9dcce
@@ -2,6 +2,10 @@ require_dependency &#39;environment&#39; @@ -2,6 +2,10 @@ require_dependency &#39;environment&#39;
2 2
3 class Environment 3 class Environment
4 4
  5 + metadata_spec tags: {
  6 + description: proc{ |e, plugin| e.name },
  7 + }
  8 +
5 metadata_spec namespace: :og, tags: { 9 metadata_spec namespace: :og, tags: {
6 type: 'website', 10 type: 'website',
7 title: proc{ |e, plugin| e.name }, 11 title: proc{ |e, plugin| e.name },
plugins/pg_search/db/migrate/20130320010063_create_indexes_for_search.rb
  Diff comments   View file @aa9dcce
1 class CreateIndexesForSearch < ActiveRecord::Migration 1 class CreateIndexesForSearch < ActiveRecord::Migration
  2 + SEARCHABLES = %w[ article comment qualifier national_region certifier profile license scrap category ]
  3 + KLASSES = SEARCHABLES.map {|searchable| searchable.camelize.constantize }
2 def self.up 4 def self.up
3 - searchables = %w[ article comment qualifier national_region certifier profile license scrap category ]  
4 - klasses = searchables.map {|searchable| searchable.camelize.constantize }  
5 - klasses.each do |klass| 5 + KLASSES.each do |klass|
6 fields = klass.pg_search_plugin_fields 6 fields = klass.pg_search_plugin_fields
7 execute "create index pg_search_plugin_#{klass.name.singularize.downcase} on #{klass.table_name} using gin(to_tsvector('simple', #{fields}))" 7 execute "create index pg_search_plugin_#{klass.name.singularize.downcase} on #{klass.table_name} using gin(to_tsvector('simple', #{fields}))"
8 end 8 end
9 end 9 end
10 10
11 def self.down 11 def self.down
12 - klasses.each do |klass| 12 + KLASSES.each do |klass|
13 execute "drop index pg_search_plugin_#{klass.name.singularize.downcase}" 13 execute "drop index pg_search_plugin_#{klass.name.singularize.downcase}"
14 end 14 end
15 end 15 end