para 0.6.9 → 0.7.0

data/app/assets/stylesheets/para/lib/selectize.sass

@@ -0,0 +1,112 @@
+//
+// Selectize
+// --------------------------------------------------
+@import "compass/css3/user-interface"
+@import "para/admin/src/variables"
+@import "para/admin/src/mixins"
+
+//== Selectize
+//
+//## Override default style
+
+//** Debug ghost margin bottom
+.selectize-control,
+.selectize-control.form-control
+  line-height: 0
+
+//** Single
+.selectize-control
+  &.single
+    .selectize-input
+      padding-right: 30px
+      //** Caret by para
+      &:after
+        right: 12px
+        +fontAwesome
+        content: "\f107"
+        border: none
+        margin-top: -6px
+        color: $gray
+    
+//** Dropdown
+
+//** Active system
+
+//** Dropdown active
+
+.selectize-input,
+.selectize-input.full
+  border-color: $input-border
+  +border-radius($input-border-radius)
+  &.focus
+    border-color: $input-border-focus
+  &.dropdown-active
+    +border-radius($input-border-radius)
+    &:after
+      border: none
+      +transform(rotate(180deg))
+      margin-top: -6px
+
+.selectize-control.single .selectize-input
+  &.dropdown-active
+    &:after
+      margin-top: -6px
+
+.selectize-dropdown,
+.selectize-input,
+.selectize-input input
+  color: $input-color
+
+.selectize-input,
+.selectize-control.single .selectize-input.input-active
+  background: $input-bg
+
+.selectize-input,
+.selectize-input.full,
+.selectize-input.not-full
+  background: $input-bg
+
+.selectize-input.not-full input
+  +input-placeholder
+    color: $input-color-placeholder
+    font-size: 0.9em
+
+.selectize-dropdown
+  [data-selectable]
+    background-color: $dropdown-bg
+    color: $dropdown-link-color
+  .active
+    background-color: $gray-lighter
+    color: $dropdown-link-hover-color
+  .selected
+    background-color: $dropdown-link-active-bg
+    color: $dropdown-link-active-color
+
+.selectize-control.multi .selectize-input > div
+  background-color: $gray-light
+  +border-radius(2px)
+  color: $text-color
+  &:hover,
+  &:focus,
+  &.active
+    background-color: $navbar-default-bg
+    color: $gray-lighter
+  .remove
+    &:hover
+      background-color: $blue-darker
+
+//== Selectize Dropdown
+//
+//## Override z-index because of Fixed actions container
+
+.selectize-dropdown,
+.selectize-dropdown.form-control
+  +material-box-shadow-soft(2)
+  border: none
+  margin: 8px 0 0 0
+  z-index: $zindex-navbar-fixed + 20
+
+.selectize-dropdown
+  [data-selectable]
+    line-weight: 300
+    padding: 8px 12px

data/app/assets/stylesheets/para/lib/slider.sass

@@ -0,0 +1,12 @@
+@import "para/admin/src/variables"
+
+.form-group
+  &.slider
+    display: block
+  .slider
+    .slider-horizontal
+      width: 100%
+
+    .slider-handle
+      background-image: none
+      background-color: $brand-primary

data/app/controllers/concerns/para/admin/resource_controller_concerns.rb

@@ -1,13 +1,25 @@
 module Para
   module Admin
     module ResourceControllerConcerns
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :set_resource_model_from_resource
+      end
+
+      private
+
+      def set_resource_model_from_resource
+        @resource_model = resource.class if resource
+      end
+
       def resource_model
         @resource_model ||= @component.try(:model)
       end
 
       def resource
         @resource ||= begin
-          resource = instance_variable_get(:"@#{ resource_name }")
+          resource = instance_variable_get(:"@#{ resource_name }") if resource_name
           # We ensure that the fetched resource is not a relation, which could
           # happen for uncountable resource names (like "news") and would make
           # code depending on the `resource` getter to fail unexpectedly
@@ -16,7 +28,7 @@ module Para
       end
 
       def resource_name
-        resource_model.model_name.singular_route_key
+        resource_model.model_name.singular_route_key if resource_model
       end
     end
   end

data/app/controllers/para/admin/base_controller.rb

@@ -27,6 +27,13 @@ module Para
 
       private
 
+      # Override cancan controlelr resource class to avoid attributes
+      # assignation issues with resources
+      #
+      def self.cancan_resource_class
+        Para::ControllerResource
+      end
+
       def authorize_admin_access
         authorize! :access, :admin
       end

data/app/controllers/para/admin/crud_resources_controller.rb

@@ -3,17 +3,20 @@ require_dependency "para/application_controller"
 module Para
   module Admin
     class CrudResourcesController < Para::Admin::ResourcesController
-      include Para::Admin::ResourceControllerConcerns
       include Para::SearchHelper
 
       before_action :load_and_authorize_crud_resource
       before_action :add_breadcrumbs, only: [:show, :index, :edit, :new]
 
+      # Include after resource loading to allow the concern to use the resource
+      # in before_action hooks
+      include Para::Admin::ResourceControllerConcerns
+
       after_action :attach_resource_to_component, only: [:create]
       after_action :remove_resource_from_component, only: [:destroy]
 
       def index
-        @q = @component.resources.search(params[:q])
+        @q = @component.resources.ransack(params[:q])
         @resources = distinct_search_results(@q).page(params[:page]).per(params[:per_page])
 
         # Sort collection for orderable and trees
@@ -51,17 +54,21 @@ module Para
       private
 
       def resource_model
-        @resource_model ||=
-          if params[:type] && @component.subclassable_with?(params[:type])
-            params[:type].constantize
+        @resource_model ||= begin
+          type = params[:type].presence || (params[:resource] && params[:resource][:type])
+
+          if type && @component.subclassable_with?(type)
+            type.constantize
           else
             super
           end
+        end
       end
 
       def load_and_authorize_crud_resource
         loader = self.class.cancan_resource_class.new(
-          self, resource_name, parent: false, class: resource_model.name, find_by: :id
+          self, resource_name, parent: false, class: resource_model.name,
+          find_by: :id, bypass_params_assignation: true
         )
 
         loader.load_and_authorize_resource

data/app/controllers/para/admin/form_resources_controller.rb

@@ -3,11 +3,13 @@ require_dependency "para/application_controller"
 module Para
   module Admin
     class FormResourcesController < Para::Admin::ResourcesController
-      include Para::Admin::ResourceControllerConcerns
-
       before_action :load_and_authorize_form
       after_action :attach_resource_to_component, only: [:create]
 
+      # Include after resource loading to allow the concern to use the resource
+      # in before_action hooks
+      include Para::Admin::ResourceControllerConcerns
+
       private
 
       def attach_resource_to_component
@@ -19,7 +21,7 @@ module Para
       def load_and_authorize_form
         loader = self.class.cancan_resource_class.new(
           self, :resource, parent: false, class: resource_model.name,
-          singleton: true, through: :component
+          singleton: true, through: :component, bypass_params_assignation: true
         )
 
         loader.load_and_authorize_resource

data/app/controllers/para/admin/resources_controller.rb

@@ -4,6 +4,7 @@ module Para
   module Admin
     class ResourcesController < Para::Admin::BaseController
       include Para::ModelHelper
+      include Para::Helpers::AttributesMappings
 
       class_attribute :resource_name, :resource_class
       load_and_authorize_component
@@ -17,6 +18,11 @@ module Para
         # Assign component the resource belongs to it
         resource.component = @component if resource.respond_to?(:component=)
 
+        # We overriden Cancan so it does not try to assign our params during the
+        # create action, allowing our attribute fields to parse them with an
+        # actual resource.
+        resource.assign_attributes(resource_params)
+
         if resource.save
           flash_message(:success, resource)
           redirect_to after_form_submit_path
@@ -86,7 +92,7 @@ module Para
       end
 
       def resource_model
-        self.class.resource_model
+        @resource_model ||= self.class.resource_model
       end
 
       def resource
@@ -112,8 +118,8 @@ module Para
       end
 
       def parse_resource_params(hash)
-        model_field_mappings(resource_model).fields.each do |field|
-          field.parse_input(hash)
+        model_field_mappings(resource_model, mappings: attributes_mappings_for(hash)).fields.each do |field|
+          field.parse_input(hash, resource)
         end
 
         hash

data/app/controllers/para/admin/search_controller.rb

@@ -0,0 +1,15 @@
+module Para
+  module Admin
+    class SearchController < ApplicationController
+      include Para::ModelHelper
+      include Para::SearchHelper
+
+      def index
+        model = params[:model_name].constantize
+        attributes = model_field_mappings(model).fields
+        @results = model.ransack(fulltext_search_param_for(attributes) => params[:search]).result
+        render layout: false
+      end
+    end
+  end
+end

data/app/controllers/para/application_controller.rb

@@ -1,7 +1,15 @@
 module Para
   class ApplicationController < ActionController::Base
-    include Para::Breadcrumbs::Controller
+    before_action :add_admin_home_breadcrumb
 
-    add_breadcrumb :home, :admin
+    def admin?
+      true
+    end
+
+    private
+
+    def add_admin_home_breadcrumb
+      add_breadcrumb :home, admin_path
+    end
   end
 end

data/app/helpers/para/admin/page_helper.rb

@@ -2,23 +2,23 @@ module Para
   module Admin
     module PageHelper
       def page_top_bar(options = {})
-        content_tag(:div, class: 'page-title') do
+        content_tag(:div, class: 'page-title row') do
           content_tag(:h1, options[:title]) +
 
           if (actions = actions_for(options[:type]))
-            content_tag(:div, class: 'page-actions') do
-              actions.map(&method(:build_action)).join('').html_safe
-            end
+            actions.map(&method(:build_action)).join('').html_safe
           end
         end
       end
 
       def build_action(action)
-        link_to(action[:url], class: 'btn btn-default') do
-          (
-            (fa_icon(action[:icon]) if action[:icon]) +
-            action[:label]
-          ).html_safe
+        content_tag(:div, class: 'actions-control pull-right') do  
+          link_to(action[:url], class: 'btn btn-default btn-shadow') do
+            (
+              (fa_icon(action[:icon], class: 'fa-fw') if action[:icon]) +
+              action[:label]
+            ).html_safe
+          end
         end
       end
 

data/app/helpers/para/application_helper.rb

@@ -1,14 +1,5 @@
 module Para
   module ApplicationHelper
-    include Para::SearchHelper
-    include Para::ModelHelper
-    include Para::OrderingHelper
-    include Para::NavigationHelper
-    include Para::FormHelper
-    include Para::MarkupHelper
-    include Para::TagHelper
-    include Para::TreeHelper
-    include Para::FlashHelper
-    include Para::TranslationsHelper
+    include Para::Helpers::ResourceName
   end
 end

data/app/helpers/para/form_helper.rb

@@ -3,7 +3,8 @@ module Para
     def para_form_for(resource, options = {}, &block)
       default_options = {
         as: :resource,
-        wrapper: :horizontal_form,
+        wrapper: :vertical_form,
+        wrapper_mappings: Para::SimpleFormConfig.wrapper_mappings,
         html: { class: '', data: { :'para-form' => true } }
       }
 
@@ -11,17 +12,13 @@ module Para
 
       options[:html][:class] = [
         options[:html][:class].presence,
-        'form-horizontal form-group-separated'
+        'form-vertical forms-outline'
       ].compact.join(' ')
 
       unless options.key?(:url)
         options[:url] = @component.relation_path(resource)
       end
 
-      if options.fetch(:fixed_actions, true)
-        default_options[:html][:class] << ' form-fixed-actions'
-      end
-
       simple_form_for(resource, options) do |form|
         capture { block.call(form) }.tap do |content|
           # Append hidden field with type if resource is subclassable
@@ -29,6 +26,8 @@ module Para
           if @component.subclassable? && resource.new_record?
             content << form.hidden_field(:type, value: resource.type)
           end
+
+          content << form.attributes_mappings_field_for(form)
         end
       end
     end

data/app/helpers/para/model_helper.rb

@@ -5,11 +5,21 @@ module Para
       model_field_mappings(model).fields
     end
 
-    def model_field_mappings(model, attributes = nil)
+    # Second argument can be the whitelist_attributes array or keyword
+    # arguments. This is to ensure backwards compatibility with old plugins.
+    #
+    def model_field_mappings(model, options = {})
+      if Array == options
+        whitelist_attributes = options
+      else
+        whitelist_attributes = options.fetch(:whitelist_attributes, nil)
+        mappings = options.fetch(:mappings, {})
+      end
+
       store_key = ['model', 'mappings', model.name.underscore].join(':')
 
-      Para.store[store_key] ||= Para::AttributeFieldMappings.new(
-        model, whitelist_attributes: attributes
+      Para::AttributeFieldMappings.new(
+        model, whitelist_attributes: whitelist_attributes, mappings: mappings
       )
     end
 

data/app/helpers/para/ordering_helper.rb

@@ -12,7 +12,7 @@ module Para
       end
 
       content_tag(:span, options) do
-        content_tag(:i, '', class: 'fa fa-bars') +
+        content_tag(:i, '', class: 'sort-dots') +
         field
       end
     end