Download as
Browse Code »

Commit b8264c55d1f8da42c3400bcd7d4098f62d48d314

Authored by Leandro Nunes dos Santos
1 parent f48e5f08
Exists in master and in 23 other branches activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies

fixing article variable name

Showing 2 changed files with 12 additions and 12 deletions   Show diff stats
db/schema.rb
  Diff comments   View file @b8264c5
... ... @@ -9,7 +9,7 @@
9 9 #
10 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 14 create_table "abuse_reports", :force => true do |t|
15 15 t.integer "reporter_id"
... ... @@ -131,7 +131,6 @@ ActiveRecord::Schema.define(:version => 20130111232201) do
131 131 t.integer "license_id"
132 132 end
133 133  
134   - add_index "articles", ["name"], :name => "index_articles_on_name"
135 134 add_index "articles", ["parent_id"], :name => "index_articles_on_parent_id"
136 135 add_index "articles", ["profile_id"], :name => "index_articles_on_profile_id"
137 136 add_index "articles", ["slug"], :name => "index_articles_on_slug"
... ... @@ -221,6 +220,7 @@ ActiveRecord::Schema.define(:version => 20130111232201) do
221 220 t.string "source_type"
222 221 t.string "user_agent"
223 222 t.string "referrer"
  223 + t.integer "group_id"
224 224 end
225 225  
226 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 264 t.text "design_data"
265 265 t.text "custom_header"
266 266 t.text "custom_footer"
267   - t.string "theme", :default => "default", :null => false
  267 + t.string "theme", :default => "default", :null => false
268 268 t.text "terms_of_use_acceptance_text"
269 269 t.datetime "created_at"
270 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 272 t.string "redirection_after_login", :default => "keep_on_same_page"
273 273 t.text "signup_welcome_text"
274 274 t.string "languages"
... ... @@ -428,7 +428,7 @@ ActiveRecord::Schema.define(:version => 20130111232201) do
428 428 t.string "type"
429 429 t.string "identifier"
430 430 t.integer "environment_id"
431   - t.boolean "active", :default => true
  431 + t.boolean "active", :default => true
432 432 t.string "address"
433 433 t.string "contact_phone"
434 434 t.integer "home_page_id"
... ... @@ -439,21 +439,21 @@ ActiveRecord::Schema.define(:version => 20130111232201) do
439 439 t.float "lat"
440 440 t.float "lng"
441 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 444 t.text "custom_header"
445 445 t.text "custom_footer"
446 446 t.string "theme"
447   - t.boolean "public_profile", :default => true
  447 + t.boolean "public_profile", :default => true
448 448 t.date "birth_date"
449 449 t.integer "preferred_domain_id"
450 450 t.datetime "updated_at"
451   - t.boolean "visible", :default => true
  451 + t.boolean "visible", :default => true
452 452 t.integer "image_id"
453   - t.boolean "validated", :default => true
  453 + t.boolean "validated", :default => true
454 454 t.string "cnpj"
455 455 t.string "national_region_code"
456   - t.boolean "is_template", :default => false
  456 + t.boolean "is_template", :default => false
457 457 t.integer "template_id"
458 458 t.string "redirection_after_login"
459 459 end
... ...
plugins/comment_group_macro/lib/comment_group_macro_plugin.rb
  Diff comments   View file @b8264c5
... ... @@ -24,7 +24,7 @@ class CommentGroupMacroPlugin < Noosfero::Plugin
24 24 article = source
25 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 28 end
29 29  
30 30 def macro_methods
... ...