Merge branch 'release/0.5.3_patch.1'

* release/0.5.3_patch.1:
  #274 some fixes
  update schema.rb

app/decorators/application_decorator.rb

@@ -2,4 +2,23 @@ class ApplicationDecorator < Draper::Decorator
   include Rails.application.routes.url_helpers
   include ActionView::Helpers
   include RussianCases
+
+  def decorated_to_json(options = {})
+    hash = object.as_json options
+    if options[:only].is_a? Array
+      options[:only].each do |attribute|
+        hash = add_to_hash_attributes hash, attribute
+      end
+    else
+      hash = add_to_hash_attributes hash, options[:only]
+    end
+    hash.to_json
+  end
+
+  private
+
+  def add_to_hash_attributes(hash, attribute)
+    hash[attribute] = send attribute.to_s unless hash.keys.include? attribute
+    hash
+  end
 end

app/decorators/event_decorator.rb

@@ -21,6 +21,10 @@ def lead
     "#{object.description.first(150)}..."
   end
 
+  def strip_tags_description
+    strip_tags(object.description).html_safe
+  end
+
   def name
     object.title
   end

app/views/web/events/show.html.haml

@@ -45,7 +45,7 @@
         .join
           -#%a.join-button.mic-press-button{ href: "#" }
           - if current_user_have_attended?(@all_registrations)
-            %button.join-button.mic-press-button{ value: 'out', data: { event: @event.to_json(only: [:id, :title, :description, :begin_date, :end_date]), user_id: current_user.id, google_id: google_id, registration: current_registration(@all_registrations).to_json(only: [:id, :google_calendar_event_id])} }
+            %button.join-button.mic-press-button{ value: 'out', data: { event: @event.decorated_to_json(only: [:id, :title, :strip_tags_description, :begin_date, :end_date]), user_id: current_user.id, google_id: google_id, registration: current_registration(@all_registrations).to_json(only: [:id, :google_calendar_event_id])} }
               = t('.i_attend')
           - else
             - if signed_in? && current_user.is_active?

db/schema.rb

@@ -28,13 +28,23 @@
     t.text     "logo"
   end
 
+  create_table "activity_lines_corporative_arguments", force: :cascade do |t|
+    t.integer  "member_id"
+    t.text     "text"
+    t.text     "argument_type"
+    t.integer  "confession_id"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+  end
+
   create_table "activity_lines_corporative_confessions", force: :cascade do |t|
     t.integer  "year"
     t.integer  "member_id"
     t.text     "nomination"
     t.text     "state"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer  "creator_id"
   end
 
   create_table "articles", force: :cascade do |t|
@@ -121,6 +131,16 @@
     t.datetime "updated_at",  null: false
   end
 
+  create_table "content_videos", force: :cascade do |t|
+    t.text     "title"
+    t.text     "description"
+    t.integer  "author_id"
+    t.text     "link"
+    t.text     "state"
+    t.datetime "created_at",  null: false
+    t.datetime "updated_at",  null: false
+  end
+
   create_table "documents", force: :cascade do |t|
     t.text     "file"
     t.text     "title"
@@ -272,6 +292,9 @@
     t.integer "user_id"
   end
 
+  add_index "teams_users", ["team_id"], name: "index_teams_users_on_team_id", using: :btree
+  add_index "teams_users", ["user_id"], name: "index_teams_users_on_user_id", using: :btree
+
   create_table "users", force: :cascade do |t|
     t.text     "email"
     t.text     "password_digest"