Merge branch 'develop'

Author: toastercup

Diff for: app/assets/javascripts/ckeditor/plugins/cortex_media_insert/plugin.js

@@ -1,19 +1,19 @@
-(function (global) { 
+(function (global) {
   'use strict';
 
   global.CKEDITOR.plugins.add('cortex_media_insert', {
     icons: 'media',
     init: function (editor) {
       editor.addCommand('insertMedia', {
         exec: function (editor) {
-          window.MODALS.featured.open();
+          window.MODALS.wysiwyg.open();
 
           global.media_select = {};
           global.media_select_defer = $.Deferred();
           global.media_select_defer.promise(global.media_select);
 
           global.media_select.done(function (media) {
-            window.MODALS.featured.close();
+            window.MODALS.wysiwyg.close();
 
             var mediaTag = editor.document.createElement('media');
             mediaTag.setAttribute('id', media.id);

Diff for: app/assets/javascripts/cortex-field_types-core/application.js

@@ -1,2 +1,4 @@
 //= require ckeditor/init
 //= require ../ckeditor/config
+
+//= require_tree ./cells

Diff for: app/assets/javascripts/cortex-field_types-core/cells/content_item.js

@@ -0,0 +1,19 @@
+$('.media-select--featured').click(function (elem) {
+  var id = $(this).data().id;
+  var title = $(this).data().title;
+  var thumb_url = $(this).data().thumb;
+
+  $(".association_content_item_id").val(id);
+
+  $('.content-item-button__selection').remove();
+  $('.content-item-button').append(
+    '<div class="content-item-button__selection">' +
+    '<img src="' + thumb_url + '" height="50px">' +
+    '<div class="content-item-button__selection__text">' +
+    'Selected Media: ' +
+    title +
+    '</div></div>'
+  );
+
+  window.MODALS.featured.close();
+});

Diff for: app/cells/plugins/core/asset/association.haml

@@ -0,0 +1,4 @@
+= render_associated_content_item_thumb
+.content-item-button__selection__text
+  Selected Media:
+  = associated_content_item_title

Diff for: app/cells/plugins/core/asset_cell.rb

@@ -3,11 +3,16 @@ module Core
     class AssetCell < Plugins::Core::Cell
       include ActionView::Helpers::NumberHelper
       include UtilityHelper
+      include Cells::AssociationHelper
 
       def input
         render
       end
 
+      def association
+        render
+      end
+
       private
 
       def render_allowed_asset_extensions
@@ -33,6 +38,14 @@ def render_label
       def render_input
         @options[:form].file_field 'data[asset]'
       end
+
+      def associated_content_item_thumb_url
+        data['asset']['style_urls']['mini']
+      end
+
+      def render_associated_content_item_thumb
+        image_tag(associated_content_item_thumb_url, height: '50px')
+      end
     end
   end
 end

Diff for: app/cells/plugins/core/asset_info_cell.rb

@@ -41,7 +41,7 @@ def updated_at
       end
 
       def link_to_asset
-        link_to(asset['url'], asset['url'])
+        link_to asset['url'], asset['url'], target: '_blank'
       end
     end
   end

Diff for: app/cells/plugins/core/content_item/popup.haml

@@ -1,13 +1,19 @@
+= render_field_id
+= render_content_item_id
+
 = render_label
 %br
-%button.content_item_button.text-center.popup--open
-  .button_content
+%button.content-item-button.popup--open
+  .content-item-button__select.content-item-button__select--selected
     %i{ class: "material-icons icon" }
       cloud_upload
     %br
-    %span.content_item_button-text
-      Click to add a
+    %span.content-item-button__select__text
+      Click to select a
       = field.name
-      from the media library
+      from the Media library
+  - if associated_content_item && associated_primary_field_type_class == AssetFieldType
+    .content-item-button__selection
+      = render_association_cell
 %small
   Recommended size: 1452px x 530px with a live area of 930px x 530px

Diff for: app/cells/plugins/core/content_item_cell.rb

@@ -7,8 +7,51 @@ def popup
 
       private
 
+      def value
+        data&.[]('content_item_id')
+      end
+
+      def associated_content_item
+        ContentItem.find_by_id(value)
+      end
+
+      def associated_primary_field
+        associated_content_item.content_type.fields.find_by_name(field.metadata['field_name'])
+      end
+
+      def associated_primary_field_type_class
+        associated_primary_field.field_type_instance.class
+      end
+
+      def associated_primary_field_item
+        associated_content_item.field_items.find_by_field_id associated_primary_field
+      end
+
+      def associated_content_item_title
+        # Gross hack, this should rely on 'primary title field' config feature in future, and should use a scope
+        title_field_item = associated_content_item.field_items.find do |field_item|
+          field_item.field.name == 'Title'
+        end
+
+        title_field_item.data['text']
+      end
+
       def render_label
-        "Add #{field.name}"
+        "Select #{field.name}"
+      end
+
+      def render_content_item_id
+        @options[:form].hidden_field 'data[content_item_id]', value: value, class: 'association_content_item_id'
+      end
+
+      def render_association_cell
+        cell(Plugins::Core::AssetCell, associated_primary_field_item,
+             associated_content_item: associated_content_item,
+             associated_primary_field: associated_primary_field,
+             associated_primary_field_type_class: associated_primary_field_type_class,
+             associated_primary_field_item: associated_primary_field_item,
+             associated_content_item_title: associated_content_item_title)
+        .(:association)
       end
     end
   end

Diff for: app/models/boolean_field_type.rb

@@ -7,7 +7,7 @@ def data=(data_hash)
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['boolean']
+    json[mapping_field_name] = field_item.data['value']
     json
   end
 

Diff for: app/models/content_item_field_type.rb

@@ -1,4 +1,16 @@
 class ContentItemFieldType < FieldType
+  attr_accessor :content_item_id
+
+  def data=(data_hash)
+    @content_item_id = data_hash.deep_symbolize_keys[:content_item_id]
+  end
+
+  def field_item_as_indexed_json_for_field_type(field_item, options = {})
+    json = {}
+    json[mapping_field_name] = field_item.data['content_item_id']
+    json
+  end
+
   def mapping
     { name: mapping_field_name, type: :string, analyzer: :snowball }
   end

Diff for: app/models/date_time_field_type.rb

@@ -10,7 +10,7 @@ def data=(data_hash)
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['date_time']
+    json[mapping_field_name] = field_item.data['timestamp']
     json
   end
 

Diff for: app/models/tag_field_type.rb

@@ -10,7 +10,7 @@ def data=(data_hash)
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['tag']
+    json[mapping_field_name] = field_item.data['tag_list']
     json
   end
 

Diff for: app/models/text_field_type.rb

@@ -1,8 +1,10 @@
 class TextFieldType < FieldType
   attr_accessor :text
+  jsonb_accessor :data, text: :string
 
   validates :text, presence: true, if: :validate_presence?
   validate :text_length, if: :validate_length?
+  validate :text_unique, if: :validate_uniqueness?
 
   def data=(data_hash)
     @text = data_hash.deep_symbolize_keys[:text]
@@ -25,14 +27,24 @@ def mapping_field_name
   end
 
   def text_present
-    errors.add(:text, "must be present") if @text.empty?
+    errors.add(:text, 'must be present') if @text.empty?
   end
 
   def text_length
     validator = LengthValidator.new(validations[:length].merge(attributes: [:text]))
     validator.validate_each(self, :text, text)
   end
 
+  def text_unique
+    unless field.field_items.jsonb_contains(:data, text: text).empty?
+      errors.add(:text, "#{field.name} Must be unique")
+    end
+  end
+
+  def validate_uniqueness?
+    @validations.key? :uniqueness
+  end
+
   def validate_presence?
     @validations.key? :presence
   end

Diff for: app/models/tree_field_type.rb

@@ -21,7 +21,7 @@ def data=(data_hash)
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['tree']
+    json[mapping_field_name] = field_item.data['values']
     json
   end
 

Diff for: app/models/user_field_type.rb

@@ -10,7 +10,7 @@ def data=(data_hash)
 
   def field_item_as_indexed_json_for_field_type(field_item, options = {})
     json = {}
-    json[mapping_field_name] = field_item.data['user']
+    json[mapping_field_name] = field_item.data['user_id']
     json
   end
 

Diff for: cortex-plugins-core.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "cells-haml", "~> 0.0.10"
   s.add_dependency "mimemagic", "~> 0.3.2"
   s.add_dependency "ckeditor", "= 4.2.0"
+  s.add_dependency "jsonb_accessor", "~> 1.0.0.beta"
 
   s.add_development_dependency "sqlite3"
 end

Diff for: lib/cortex/plugins/core/engine.rb

@@ -1,4 +1,5 @@
 require 'ckeditor'
+require 'jsonb_accessor'
 
 module Cortex
   module Plugins

Diff for: lib/cortex/plugins/core/version.rb

@@ -1,7 +1,7 @@
 module Cortex
   module Plugins
     module Core
-      VERSION = '0.5.0'
+      VERSION = '0.6.0'
     end
   end
 end