Commit 79e1e27366874ba8f82a80dcab591f04487460c5
1 parent
6f90eabe
Exists in
master
and in
1 other branch
Adding public metadata
Showing
3 changed files
with
9 additions
and
4 deletions
Show diff stats
lib/inclusao_digital_plugin.rb
@@ -34,7 +34,7 @@ class InclusaoDigitalPlugin < Noosfero::Plugin | @@ -34,7 +34,7 @@ class InclusaoDigitalPlugin < Noosfero::Plugin | ||
34 | end | 34 | end |
35 | 35 | ||
36 | def self.csv_first_data_row | 36 | def self.csv_first_data_row |
37 | - 9 | 37 | + 10 |
38 | end | 38 | end |
39 | 39 | ||
40 | def self.load_all_from_scratch | 40 | def self.load_all_from_scratch |
lib/inclusao_digital_plugin/custom_fields_filler.rb
@@ -13,7 +13,7 @@ class InclusaoDigitalPlugin::CustomFieldsFiller | @@ -13,7 +13,7 @@ class InclusaoDigitalPlugin::CustomFieldsFiller | ||
13 | ActiveRecord::Base.connection.execute("TRUNCATE custom_fields RESTART IDENTITY") | 13 | ActiveRecord::Base.connection.execute("TRUNCATE custom_fields RESTART IDENTITY") |
14 | end | 14 | end |
15 | 15 | ||
16 | - def self.load_domains | 16 | + def self.feed_store |
17 | return unless InclusaoDigitalPlugin::Store.data.empty? or InclusaoDigitalPlugin::Store.data[:domains].empty? | 17 | return unless InclusaoDigitalPlugin::Store.data.empty? or InclusaoDigitalPlugin::Store.data[:domains].empty? |
18 | line = 1 | 18 | line = 1 |
19 | meta_data = [] | 19 | meta_data = [] |
@@ -35,6 +35,11 @@ class InclusaoDigitalPlugin::CustomFieldsFiller | @@ -35,6 +35,11 @@ class InclusaoDigitalPlugin::CustomFieldsFiller | ||
35 | extras = YAML.load(row[4]) | 35 | extras = YAML.load(row[4]) |
36 | InclusaoDigitalPlugin::Store.data[:domains][name]=extras | 36 | InclusaoDigitalPlugin::Store.data[:domains][name]=extras |
37 | end | 37 | end |
38 | + if row[9].present? | ||
39 | + InclusaoDigitalPlugin::Store.data[:public][name]=true | ||
40 | + else | ||
41 | + InclusaoDigitalPlugin::Store.data[:public][name]=false | ||
42 | + end | ||
38 | end | 43 | end |
39 | InclusaoDigitalPlugin::Store.data | 44 | InclusaoDigitalPlugin::Store.data |
40 | end | 45 | end |
lib/inclusao_digital_plugin/pids_loader.rb
@@ -12,7 +12,7 @@ class InclusaoDigitalPlugin::PidsLoader < MyProfileController | @@ -12,7 +12,7 @@ class InclusaoDigitalPlugin::PidsLoader < MyProfileController | ||
12 | 12 | ||
13 | def self.append_values(r) | 13 | def self.append_values(r) |
14 | r.each do |k,v| | 14 | r.each do |k,v| |
15 | - @custom_values_hash["custom_values"][k]={"value"=>v, "public"=>true} | 15 | + @custom_values_hash["custom_values"][k]={"value"=>v, "public"=>InclusaoDigitalPlugin::Store.data[:public][k]} |
16 | end | 16 | end |
17 | end | 17 | end |
18 | 18 | ||
@@ -29,7 +29,6 @@ class InclusaoDigitalPlugin::PidsLoader < MyProfileController | @@ -29,7 +29,6 @@ class InclusaoDigitalPlugin::PidsLoader < MyProfileController | ||
29 | end | 29 | end |
30 | 30 | ||
31 | def self.check_domains(r, line) | 31 | def self.check_domains(r, line) |
32 | - InclusaoDigitalPlugin::CustomFieldsFiller.load_domains | ||
33 | InclusaoDigitalPlugin::Store.data[:domains].each do |k, v| | 32 | InclusaoDigitalPlugin::Store.data[:domains].each do |k, v| |
34 | unless v.include? r[k] | 33 | unless v.include? r[k] |
35 | log("Linha: #{line} - Campo #{k} com valor inválido '#{r[k]}'") | 34 | log("Linha: #{line} - Campo #{k} com valor inválido '#{r[k]}'") |
@@ -72,6 +71,7 @@ class InclusaoDigitalPlugin::PidsLoader < MyProfileController | @@ -72,6 +71,7 @@ class InclusaoDigitalPlugin::PidsLoader < MyProfileController | ||
72 | end | 71 | end |
73 | 72 | ||
74 | def self.load | 73 | def self.load |
74 | + InclusaoDigitalPlugin::CustomFieldsFiller.feed_store | ||
75 | line = 0 | 75 | line = 0 |
76 | FileUtils.rm_rf @log | 76 | FileUtils.rm_rf @log |
77 | 77 |