diff --git a/db/schema.rb b/db/schema.rb index 1c77ff04b..9d07bbf24 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150820025358) do +ActiveRecord::Schema.define(:version => 20150820004659) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -1404,15 +1404,6 @@ ActiveRecord::Schema.define(:version => 20150820025358) do t.integer "fields_bits", :default => 0 end - create_table "user_activities", :force => true do |t| - t.string "act_type" - t.integer "act_id" - t.string "container_type" - t.integer "container_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false - end - create_table "user_extensions", :force => true do |t| t.integer "user_id", :null => false t.date "birthday" @@ -1525,6 +1516,7 @@ ActiveRecord::Schema.define(:version => 20150820025358) do t.string "identity_url" t.string "mail_notification", :default => "", :null => false t.string "salt", :limit => 64 + t.integer "gid" end add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id" diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 270618522..98dfc470b 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -5157,7 +5157,7 @@ KEditor.prototype = { } }); } else { - statusbar.last().css('visibility', 'hidden'); + if(statusbar.last()) {statusbar.last().css('visibility', 'hidden');} } } return self;