Merge branch 'develop'

Author: toastercup

app/api/v1/entities/webpage.rb

@@ -22,12 +22,14 @@ class Webpage < Grape::Entity
 
       expose :tables_widget_json, documentation:  {type: 'Hash', is_array: true, desc: 'Tables Widget Data as JSON'}
       expose :charts_widget_json, documentation:  {type: 'Hash', is_array: true, desc: 'Charts Widget Data as JSON'}
+      expose :accordion_group_widget_json, documentation:  {type: 'Hash', is_array: true, desc: 'Accordion Group Widget Data as JSON'}
 
       with_options if: { full: true } do
         expose :user, with: '::V1::Entities::User', documentation: {type: 'User', desc: 'Owner'}
         expose :url, documentation: { type: 'String', desc: 'URL of Webpage' }
 
         expose :tables_widget_yaml, documentation:  {type: 'Hash', is_array: true, desc: 'Tables Widget Data as YAML'}
+        expose :accordion_group_widget_yaml, documentation:  {type: 'Hash', is_array: true, desc: 'Accordion Group Widget Data as YAML'}
         expose :charts_widget_yaml, documentation:  {type: 'Hash', is_array: true, desc: 'Charts Widget Data as YAML'}
       end
     end

app/assets/legacy_templates/webpages/edit.html

@@ -112,6 +112,12 @@
                       ng-model="data.webpage.tables_widget_yaml"
                       placeholder="YAML-formatted table data"></textarea>
           </div>
+          <div class="form-group">
+            <label for="accordion_group_widget_yaml">Accordion Group Data</label>
+            <textarea id="accordion_group_widget_yaml" name="accordion_group_widget_yaml" class="form-control" rows="15"
+                      ng-model="data.webpage.accordion_group_widget_yaml"
+                      placeholder="YAML-formatted accordion group data"></textarea>
+          </div>
           <div class="form-group">
             <label for="charts_widget_yaml">Charts Data</label>
             <textarea id="charts_widget_yaml" name="charts_widget_yaml" class="form-control" rows="15"

app/models/concerns/searchable_webpage.rb

@@ -30,6 +30,7 @@ module SearchableWebpage
       indexes :noarchive, :type => :boolean, :index => :not_analyzed
       indexes :noimageindex, :type => :boolean, :index => :not_analyzed
       indexes :tables_widget, :type => :nested, :enabled => false
+      indexes :accordion_group_widget, :type => :nested, :enabled => false
       indexes :charts_widget, :type => :nested, :enabled => false
     end
 

app/models/webpage.rb

@@ -47,4 +47,20 @@ def charts_widget_json
   def charts_widget_json= p
     self.charts_widget = JSON.parse(p, quirks_mode: true) # Quirks mode will let us parse a null JSON object
   end
+
+  def accordion_group_widget_yaml
+    accordion_group_widget.to_yaml
+  end
+
+  def accordion_group_widget_yaml= p
+    self.accordion_group_widget = YAML.load(p)
+  end
+
+  def accordion_group_widget_json
+    accordion_group_widget.to_json
+  end
+
+  def accordion_group_widget_json= p
+    self.accordion_group_widget = JSON.parse(p, quirks_mode: true) # Quirks mode will let us parse a null JSON object
+  end
 end

db/migrate/20170525015850_add_accordion_group_widget_to_webpage.rb

@@ -0,0 +1,5 @@
+class AddAccordionGroupWidgetToWebpage < ActiveRecord::Migration[5.0]
+  def change
+    add_column :webpages, :accordion_group_widget, :jsonb
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170519201648) do
+ActiveRecord::Schema.define(version: 20170525015850) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -471,6 +471,7 @@
     t.string   "dynamic_yield_sku"
     t.string   "dynamic_yield_category"
     t.jsonb    "tables_widget"
+    t.jsonb    "accordion_group_widget"
     t.jsonb    "charts_widget"
     t.index ["user_id"], name: "index_webpages_on_user_id", using: :btree
   end