From 194a4dc975780a77b7a4edfb76d13f3e1fa765c4 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Thu, 4 Aug 2016 16:53:09 +0800 Subject: [PATCH 1/4] add production schema file --- db/schema.rb | 75 +++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index d3dc9634..e5bd754e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -38,15 +38,12 @@ ActiveRecord::Schema.define(version: 20160401133937) do t.string "eventable_type" t.integer "user_id" t.integer "map_id" - t.integer "sequence_id" t.datetime "created_at" t.datetime "updated_at" end add_index "events", ["eventable_type", "eventable_id"], name: "index_events_on_eventable_type_and_eventable_id", using: :btree - add_index "events", ["map_id", "sequence_id"], name: "index_events_on_map_id_and_sequence_id", unique: true, using: :btree add_index "events", ["map_id"], name: "index_events_on_map_id", using: :btree - add_index "events", ["sequence_id"], name: "index_events_on_sequence_id", using: :btree add_index "events", ["user_id"], name: "index_events_on_user_id", using: :btree create_table "in_metacode_sets", force: :cascade do |t| @@ -80,16 +77,16 @@ ActiveRecord::Schema.define(version: 20160401133937) do add_index "mappings", ["user_id"], name: "index_mappings_on_user_id", using: :btree create_table "maps", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false t.text "name" - t.boolean "arranged" t.text "desc" t.text "permission" t.integer "user_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.boolean "arranged" t.boolean "featured" - t.string "screenshot_file_name" - t.string "screenshot_content_type" + t.string "screenshot_file_name", limit: 255 + t.string "screenshot_content_type", limit: 255 t.integer "screenshot_file_size" t.datetime "screenshot_updated_at" end @@ -110,22 +107,22 @@ ActiveRecord::Schema.define(version: 20160401133937) do add_index "messages", ["user_id"], name: "index_messages_on_user_id", using: :btree create_table "metacode_sets", force: :cascade do |t| - t.string "name" + t.string "name", limit: 255 t.text "desc" t.integer "user_id" t.boolean "mapperContributed" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end add_index "metacode_sets", ["user_id"], name: "index_metacode_sets_on_user_id", using: :btree create_table "metacodes", force: :cascade do |t| t.text "name" - t.string "manual_icon" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "color" + t.string "manual_icon", limit: 255 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "color", limit: 255 t.string "aws_icon_file_name" t.string "aws_icon_content_type" t.integer "aws_icon_file_size" @@ -175,13 +172,13 @@ ActiveRecord::Schema.define(version: 20160401133937) do create_table "synapses", force: :cascade do |t| t.text "desc" t.text "category" - t.text "weight" - t.text "permission" t.integer "node1_id" t.integer "node2_id" t.integer "user_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.text "permission" + t.text "weight" t.integer "defer_to_map_id" end @@ -205,17 +202,17 @@ ActiveRecord::Schema.define(version: 20160401133937) do t.text "name" t.text "desc" t.text "link" - t.text "permission" t.integer "user_id" t.integer "metacode_id" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.string "image_file_name" - t.string "image_content_type" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.text "permission" + t.string "image_file_name", limit: 255 + t.string "image_content_type", limit: 255 t.integer "image_file_size" t.datetime "image_updated_at" - t.string "audio_file_name" - t.string "audio_content_type" + t.string "audio_file_name", limit: 255 + t.string "audio_content_type", limit: 255 t.integer "audio_file_size" t.datetime "audio_updated_at" t.integer "defer_to_map_id" @@ -235,30 +232,30 @@ ActiveRecord::Schema.define(version: 20160401133937) do add_index "user_maps", ["user_id"], name: "index_user_maps_on_user_id", using: :btree create_table "users", force: :cascade do |t| - t.string "name" - t.string "email" - t.text "settings" - t.string "code", limit: 8 - t.string "joinedwithcode", limit: 8 - t.string "crypted_password" - t.string "password_salt" - t.string "persistence_token" - t.string "perishable_token" + t.string "name", limit: 255 + t.string "email", limit: 255 + t.string "crypted_password", limit: 255 + t.string "password_salt", limit: 255 + t.string "persistence_token", limit: 255 + t.string "perishable_token", limit: 255 t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "code", limit: 8 + t.string "joinedwithcode", limit: 8 + t.text "settings" t.string "encrypted_password", limit: 128, default: "" - t.string "remember_token" + t.string "remember_token", limit: 255 t.datetime "remember_created_at" - t.string "reset_password_token" + t.string "reset_password_token", limit: 255 t.datetime "last_sign_in_at" - t.string "last_sign_in_ip" + t.string "last_sign_in_ip", limit: 255 t.integer "sign_in_count", default: 0 t.datetime "current_sign_in_at" - t.string "current_sign_in_ip" + t.string "current_sign_in_ip", limit: 255 t.datetime "reset_password_sent_at" t.boolean "admin" - t.string "image_file_name" - t.string "image_content_type" + t.string "image_file_name", limit: 255 + t.string "image_content_type", limit: 255 t.integer "image_file_size" t.datetime "image_updated_at" t.integer "generation" From 69bdb0bf01074a51e76ab845b00b00617043f95b Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Thu, 4 Aug 2016 17:04:01 +0800 Subject: [PATCH 2/4] hotfix master with mappable_policy.try --- app/policies/mapping_policy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/policies/mapping_policy.rb b/app/policies/mapping_policy.rb index 5826ccd4..ce8522df 100644 --- a/app/policies/mapping_policy.rb +++ b/app/policies/mapping_policy.rb @@ -16,7 +16,7 @@ class MappingPolicy < ApplicationPolicy end def show? - map_policy.show? && mappable_policy.show? + map_policy.show? && mappable_policy.try(:show?) end def create? From a6951920eb4fed44b439f8d24fa667da1170788e Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Thu, 4 Aug 2016 17:08:10 +0800 Subject: [PATCH 3/4] fix module.exports javascript bug --- app/assets/javascripts/src/Metamaps.Import.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.Import.js b/app/assets/javascripts/src/Metamaps.Import.js index 159298b8..e82a05c5 100644 --- a/app/assets/javascripts/src/Metamaps.Import.js +++ b/app/assets/javascripts/src/Metamaps.Import.js @@ -320,5 +320,3 @@ Metamaps.Import = { Metamaps.Synapse.renderSynapse(mapping, synapse, node1, node2, true) } } - -module.exports = Metamaps.Import From 23543ac7adc7960a596c615fcf20936587d12964 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Sun, 7 Aug 2016 17:18:54 +0800 Subject: [PATCH 4/4] fix: synapse import fails if synapses are missing desc --- app/assets/javascripts/src/Metamaps.Import.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/src/Metamaps.Import.js b/app/assets/javascripts/src/Metamaps.Import.js index e82a05c5..c04a0f5b 100644 --- a/app/assets/javascripts/src/Metamaps.Import.js +++ b/app/assets/javascripts/src/Metamaps.Import.js @@ -272,7 +272,7 @@ Metamaps.Import = { name: name, metacode_id: metacode.id, permission: permission || Metamaps.Active.Map.get('permission'), - desc: desc, + desc: desc || "", link: link }) Metamaps.Topics.add(topic) @@ -292,7 +292,7 @@ Metamaps.Import = { Metamaps.Famous.viz.hideInstructions() }, - createSynapseWithParameters: function (description, category, permission, + createSynapseWithParameters: function (desc, category, permission, topic1, topic2) { var node1 = topic1.get('node') var node2 = topic2.get('node') @@ -303,7 +303,7 @@ Metamaps.Import = { } // if var synapse = new Metamaps.Backbone.Synapse({ - desc: description, + desc: desc || "", category: category, permission: permission, node1_id: topic1.id,