Merge pull request #7072 from code-dot-org/add-level-notes-to-levelbu…

…ilder add notes column to levels table
code-dot-org · Mar 3, 2016 · 660c8e5 · 660c8e5
2 parents 51c178b + 35a4a0a
commit 660c8e5
Show file tree

Hide file tree

Showing 31 changed files with 42 additions and 1 deletion.
diff --git a/dashboard/app/controllers/levels_controller.rb b/dashboard/app/controllers/levels_controller.rb
@@ -228,6 +228,7 @@ def set_level
   def level_params
     permitted_params = [
       :name,
+      :notes,
       :type,
       :level_num,
       :user,

diff --git a/dashboard/app/models/applab.rb b/dashboard/app/models/applab.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/artist.rb b/dashboard/app/models/artist.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/blockly.rb b/dashboard/app/models/blockly.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/calc.rb b/dashboard/app/models/calc.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/contract_match.rb b/dashboard/app/models/contract_match.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/craft.rb b/dashboard/app/models/craft.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/dsl_defined.rb b/dashboard/app/models/dsl_defined.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/eval.rb b/dashboard/app/models/eval.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/external.rb b/dashboard/app/models/external.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/frequency_analysis.rb b/dashboard/app/models/frequency_analysis.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/gamelab.rb b/dashboard/app/models/gamelab.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/grid.rb b/dashboard/app/models/grid.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/karel.rb b/dashboard/app/models/karel.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/level.rb b/dashboard/app/models/level.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/match.rb b/dashboard/app/models/match.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/maze.rb b/dashboard/app/models/maze.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/multi.rb b/dashboard/app/models/multi.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/net_sim.rb b/dashboard/app/models/net_sim.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/odometer.rb b/dashboard/app/models/odometer.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/pixelation.rb b/dashboard/app/models/pixelation.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/studio.rb b/dashboard/app/models/studio.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/studio_ec.rb b/dashboard/app/models/studio_ec.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/text_compression.rb b/dashboard/app/models/text_compression.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/text_match.rb b/dashboard/app/models/text_match.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/unplugged.rb b/dashboard/app/models/unplugged.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/vigenere.rb b/dashboard/app/models/vigenere.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/models/widget.rb b/dashboard/app/models/widget.rb
@@ -15,6 +15,7 @@
 #  type                     :string(255)
 #  md5                      :string(255)
 #  published                :boolean          default(FALSE), not null
+#  notes                    :text(65535)
 #
 # Indexes
 #

diff --git a/dashboard/app/views/levels/editors/_all.html.haml b/dashboard/app/views/levels/editors/_all.html.haml
@@ -4,6 +4,13 @@
   = javascript_include_tag 'js/levelbuilder'
   = javascript_include_tag 'jquery.handsontable.full'
 
+- unless @level.is_a? DSLDefined
+  .field
+    = f.label 'notes'
+    %p
+      Notes for yourself or other Levelbuilders. Viewable here and here alone.
+    = f.text_area :notes, rows: 6, class: "input-block-level"
+
 .field
   = f.label 'concepts'
   %p

diff --git a/dashboard/db/migrate/20160301213220_add_notes_to_levels.rb b/dashboard/db/migrate/20160301213220_add_notes_to_levels.rb
@@ -0,0 +1,5 @@
+class AddNotesToLevels < ActiveRecord::Migration
+  def change
+    add_column :levels, :notes, :text
+  end
+end
diff --git a/dashboard/db/schema.rb b/dashboard/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160225192540) do
+ActiveRecord::Schema.define(version: 20160301213220) do
 
   create_table "activities", force: :cascade do |t|
     t.integer  "user_id",         limit: 4
@@ -283,6 +283,7 @@
     t.string   "type",                     limit: 255
     t.string   "md5",                      limit: 255
     t.boolean  "published",                              default: false, null: false
+    t.text     "notes",                    limit: 65535
   end
 
   add_index "levels", ["game_id"], name: "index_levels_on_game_id", using: :btree