Commit b8264c55d1f8da42c3400bcd7d4098f62d48d314

Authored by Leandro Nunes dos Santos
1 parent f48e5f08

fixing article variable name

@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 # 9 #
10 # It's strongly recommended to check this file into your version control system. 10 # It's strongly recommended to check this file into your version control system.
11 11
12 -ActiveRecord::Schema.define(:version => 20130111232201) do 12 +ActiveRecord::Schema.define(:version => 20130117132943) do
13 13
14 create_table "abuse_reports", :force => true do |t| 14 create_table "abuse_reports", :force => true do |t|
15 t.integer "reporter_id" 15 t.integer "reporter_id"
@@ -131,7 +131,6 @@ ActiveRecord::Schema.define(:version => 20130111232201) do @@ -131,7 +131,6 @@ ActiveRecord::Schema.define(:version => 20130111232201) do
131 t.integer "license_id" 131 t.integer "license_id"
132 end 132 end
133 133
134 - add_index "articles", ["name"], :name => "index_articles_on_name"  
135 add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id" 134 add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
136 add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id" 135 add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
137 add_index "articles", ["slug"], :name => "index_articles_on_slug" 136 add_index "articles", ["slug"], :name => "index_articles_on_slug"
@@ -221,6 +220,7 @@ ActiveRecord::Schema.define(:version => 20130111232201) do @@ -221,6 +220,7 @@ ActiveRecord::Schema.define(:version => 20130111232201) do
221 t.string "source_type" 220 t.string "source_type"
222 t.string "user_agent" 221 t.string "user_agent"
223 t.string "referrer" 222 t.string "referrer"
  223 + t.integer "group_id"
224 end 224 end
225 225
226 add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam" 226 add_index "comments", ["source_id", "spam"], :name => "index_comments_on_source_id_and_spam"
@@ -264,11 +264,11 @@ ActiveRecord::Schema.define(:version => 20130111232201) do @@ -264,11 +264,11 @@ ActiveRecord::Schema.define(:version => 20130111232201) do
264 t.text "design_data" 264 t.text "design_data"
265 t.text "custom_header" 265 t.text "custom_header"
266 t.text "custom_footer" 266 t.text "custom_footer"
267 - t.string "theme", :default => "default", :null => false 267 + t.string "theme", :default => "default", :null => false
268 t.text "terms_of_use_acceptance_text" 268 t.text "terms_of_use_acceptance_text"
269 t.datetime "created_at" 269 t.datetime "created_at"
270 t.datetime "updated_at" 270 t.datetime "updated_at"
271 - t.integer "reports_lower_bound", :default => 0, :null => false 271 + t.integer "reports_lower_bound", :default => 0, :null => false
272 t.string "redirection_after_login", :default => "keep_on_same_page" 272 t.string "redirection_after_login", :default => "keep_on_same_page"
273 t.text "signup_welcome_text" 273 t.text "signup_welcome_text"
274 t.string "languages" 274 t.string "languages"
@@ -428,7 +428,7 @@ ActiveRecord::Schema.define(:version => 20130111232201) do @@ -428,7 +428,7 @@ ActiveRecord::Schema.define(:version => 20130111232201) do
428 t.string "type" 428 t.string "type"
429 t.string "identifier" 429 t.string "identifier"
430 t.integer "environment_id" 430 t.integer "environment_id"
431 - t.boolean "active", :default => true 431 + t.boolean "active", :default => true
432 t.string "address" 432 t.string "address"
433 t.string "contact_phone" 433 t.string "contact_phone"
434 t.integer "home_page_id" 434 t.integer "home_page_id"
@@ -439,21 +439,21 @@ ActiveRecord::Schema.define(:version => 20130111232201) do @@ -439,21 +439,21 @@ ActiveRecord::Schema.define(:version => 20130111232201) do
439 t.float "lat" 439 t.float "lat"
440 t.float "lng" 440 t.float "lng"
441 t.integer "geocode_precision" 441 t.integer "geocode_precision"
442 - t.boolean "enabled", :default => true  
443 - t.string "nickname", :limit => 16 442 + t.boolean "enabled", :default => true
  443 + t.string "nickname", :limit => 16
444 t.text "custom_header" 444 t.text "custom_header"
445 t.text "custom_footer" 445 t.text "custom_footer"
446 t.string "theme" 446 t.string "theme"
447 - t.boolean "public_profile", :default => true 447 + t.boolean "public_profile", :default => true
448 t.date "birth_date" 448 t.date "birth_date"
449 t.integer "preferred_domain_id" 449 t.integer "preferred_domain_id"
450 t.datetime "updated_at" 450 t.datetime "updated_at"
451 - t.boolean "visible", :default => true 451 + t.boolean "visible", :default => true
452 t.integer "image_id" 452 t.integer "image_id"
453 - t.boolean "validated", :default => true 453 + t.boolean "validated", :default => true
454 t.string "cnpj" 454 t.string "cnpj"
455 t.string "national_region_code" 455 t.string "national_region_code"
456 - t.boolean "is_template", :default => false 456 + t.boolean "is_template", :default => false
457 t.integer "template_id" 457 t.integer "template_id"
458 t.string "redirection_after_login" 458 t.string "redirection_after_login"
459 end 459 end
plugins/comment_group_macro/lib/comment_group_macro_plugin.rb
@@ -24,7 +24,7 @@ class CommentGroupMacroPlugin < Noosfero::Plugin @@ -24,7 +24,7 @@ class CommentGroupMacroPlugin < Noosfero::Plugin
24 article = source 24 article = source
25 count = article.group_comments.without_spam.in_group(group_id).count 25 count = article.group_comments.without_spam.in_group(group_id).count
26 26
27 - lambda {render :partial => 'plugins/comment_group_macro/views/comment_group.rhtml', :locals => {:group_id => group_id, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => artile.profile }} 27 + lambda {render :partial => 'plugins/comment_group_macro/views/comment_group.rhtml', :locals => {:group_id => group_id, :article_id => article.id, :inner_html => inner_html, :count => count, :profile_identifier => article.profile }}
28 end 28 end
29 29
30 def macro_methods 30 def macro_methods