para 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea023e2c7951df293b131af9c362b630a80acedb
-  data.tar.gz: e4a5edf55b4d9a1f98a7deac738a28169c227dfa
+  metadata.gz: 0f2e4cc7267a3d024fb9690cf426b0064bdb5da8
+  data.tar.gz: eea345a2e6a7b354420b6fb27d8bcef5bda8d5b9
 SHA512:
-  metadata.gz: ac5856d930a5a18d535b5a5636809598ab4676a2f349523265edf1a87bdfdfb7efc5f94ad720315468d56c55b46895f5184ace70f4a95b719747437f1758a37d
-  data.tar.gz: e001063051553067ba717acb4900368bfd054b97a46e7ea8bbdbdbc0e70369e22d8dbfe41cd53437bbfd545434b968688c61d494847ea234ae8f45f8c383f016
+  metadata.gz: 75f8375384ace99363c1d518f82df23c7261cc96d86b925d743dcf6052b8d9d79a767eb2c2d21ebbe549798cf22caa429ca7cd88d1bb32acd96f497bf9afc9b0
+  data.tar.gz: ea104d47ae45e079a54d0af2c2af8212dc2d5148722ee432f54764594d09cfff86988ec4ff2b4bdb15f96938c668fbb817e6c19f6774519c3ddcf5f99c96f0a5

data/app/assets/javascripts/para/admin/tabs.coffee

@@ -10,13 +10,17 @@ class Para.Tabs extends Vertebra.View
     @$anchorInput = options.$anchorInput
     @showActiveTab()
     @refreshTabsErrors()
+    @initializeAffix()
 
   showActiveTab: ->
     if (hash = (location.hash or @$anchorInput?.val()))
       @findTab(hash).tab('show')
 
   onTabShown: (e) =>
-    tabHash = $(e.target).attr('href')
+    $tab = $(e.target)
+    return unless $tab.closest('[data-form-tabs]').is('[data-top-level-tabs]')
+
+    tabHash = $tab.attr('href')
     history.pushState(null, null, tabHash)
     @updateAnchorInput()
 
@@ -31,6 +35,21 @@ class Para.Tabs extends Vertebra.View
     $panel = @$($tab.attr('href'))
     $tab.addClass('has-error') if $panel.find('.has-error').length
 
+  #
+  initializeAffix: ->
+    return unless (@$nav = @$('[data-tabs-nav-affix]')).length
+
+    headerHeight = $('[data-header]').outerHeight()
+    offsetTop = @$nav.offset().top - headerHeight
+    sidebarWidth = $('[data-admin-left-sidebar]').outerWidth()
+
+    @$nav.affix(offset: { top: offsetTop })
+         .css(top: headerHeight, left: sidebarWidth)
+
+    # Fix parent wrapper height to maintain the same scroll position when the
+    # nav tabs are fixed to top
+    @$nav.closest('[data-nav-tabs-wrapper]').height(@$nav.outerHeight())
+
   onFormInputUpdate: (e) ->
     $tab = @findTab($(e.currentTarget).attr('id'))
     @refreshTabErrors($tab)

data/app/assets/javascripts/para/admin.coffee

@@ -9,6 +9,7 @@
 #= require html5-sortable
 #= require cocoon
 #= require jquery.remote-modal-form
+#= require jquery.iframe-transport
 #= require_self
 #= require_tree ./lib
 #= require_tree ./inputs

data/app/assets/javascripts/para/inputs/multi-select-input.coffee

@@ -12,6 +12,7 @@ class Para.MultiSelectInput extends Vertebra.View
 
     @searchURL = @$el.data('search-url')
     @orderable = @$el.is('[data-orderable]')
+    @searchParam = @$searchField.attr('name')
 
     @noSelectedItemsTemplate = @$('[data-no-selected-items]').data('no-selected-items')
     @noAvailableItemsTemplate = @$('[data-no-available-items]').data('no-available-items')
@@ -31,13 +32,14 @@ class Para.MultiSelectInput extends Vertebra.View
 
   searchFor: (terms) ->
     terms = trim(terms)
-    return if terms is @terms
+    return if terms is @terms or (!terms and !@terms)
     @terms = terms
     @setLoading(true)
     @_currentSearchXHR?.abort()
-    @_currentSearchXHR = $.get(@searchURL, search: terms).done(@onSearchReturn)
+    data = @$('[data-search-field-input]').serialize()
+    @_currentSearchXHR = $.get(@searchURL, data).done(@onSearchReturn)
 
-  onSearchReturn: (results, b, c) =>
+  onSearchReturn: (results) =>
     @_currentSearchXHR = null
     @setLoading(false)
     @$('[data-available-items] tbody').html(results)

data/app/assets/javascripts/para/inputs/nested_many.coffee

@@ -48,11 +48,45 @@ class Para.NestedManyField
 
   collapseShown: (e) ->
     $target = $(e.target)
+
+    if $target.is("[data-rendered]") or $target.data("rendered")
+      @initializeCollapseContent($target)
+    else
+      @loadCollapseContent($target)
+      @scrollToTarget($target)
+
+  initializeCollapseContent: ($target) ->
+    @scrollToTarget($target)
+    @focusFirstField($target)
+
+  scrollToTarget: ($target) ->
     $field = @$field.find("[data-toggle='collapse'][href='##{ $target.attr('id') }']")
-    scrollOffset = -($('[data-header]').outerHeight() + 20)
+    scrollOffset = -($('[data-header]').outerHeight() + 30)
+
+    if ($affixNavTabs = $("[data-tabs-nav-affix]:eq(0)")).length
+      scrollOffset -= $affixNavTabs.outerHeight()
+
     $.scrollTo($field, 200, offset: scrollOffset)
+
+  focusFirstField: ($target) ->
     $target.find('input, textarea, select').eq('0').focus()
 
+  loadCollapseContent: ($target) ->
+    targetUrl = $target.data("render-path")
+    return unless targetUrl
+
+    data = {
+      "id": $target.data("id")
+      "object_name": $target.data("object-name")
+      "model_name": $target.data("model-name")
+    }
+
+    $.get(targetUrl, data).then (resp) =>
+      $content = $(resp)
+      $target.find("[data-nested-form-container]:eq(0)").html($content)
+      $content.simpleForm()
+      @focusFirstField($target)
+      $target.data("rendered", true)
 
 $.simpleForm.onDomReady ($document) ->
   $document.find('.nested-many-field').each (i, el) -> new Para.NestedManyField($(el))

data/app/assets/javascripts/para/lib/remote-file-forms.coffee

@@ -6,9 +6,10 @@
 # of original rails' remote form requests, to allow existing handling code
 # to run without any modification.
 #
-class RemoteFileForm
-  constructor: (options = {}) ->
-    @$el = $(options.el)
+class @RemoteFileForm extends Vertebra.View
+  @supported = FormData isnt undefined
+  
+  initialize: (options = {}) ->
     @submitForm() if $.rails.fire(@$el, 'ajax:before')
 
   submitForm: ->
@@ -28,7 +29,7 @@ class RemoteFileForm
       success: @success
       complete: @complete
       error: @error
-      crossDomain: $.rails.isCrossDomain(url)
+      crossDomain: $.rails.isCrossDomain?(url)
 
   buildXHR: =>
     xhr = $.ajaxSettings.xhr()
@@ -50,10 +51,8 @@ class RemoteFileForm
   error: (xhr, status, error) =>
     @$el.trigger('ajax:error', [xhr, status, error])
 
-  # TODO : Implement an upload progress bar for heavy files
-  #
   progress: (e) =>
-    # console.log e.loaded, '/', e.total if e.lengthComputable
+    @trigger('progress', e)
 
 $(document).on 'ajax:aborted:file', (e) ->
   new RemoteFileForm(el: e.target)

data/app/assets/javascripts/para/lib/turbolinks-loading.coffee

@@ -22,4 +22,4 @@ $(document).on('page:fetch', Para.loadingManager.start)
 
 $(document).on 'page:change turbolinks:load', ->
   Para.loadingManager.stop()
-  $('body').on('submit', '[data-para-form]', Para.loadingManager.start)
+  $('body').on('submit', '[data-para-form]:not([data-remote])', Para.loadingManager.start)

data/app/assets/stylesheets/para/admin/main.sass

@@ -14,6 +14,7 @@
 @import "src/table"
 @import "src/list"
 @import "src/panel"
+@import "src/affix"
 @import "src/alert"
 @import "src/dropdown"
 @import "src/multi-select"

data/app/assets/stylesheets/para/admin/src/_affix.sass

@@ -0,0 +1,4 @@
+@media (max-width: $screen-md-min)
+  .affix
+    &.affix-no-mobile
+      position: static

data/app/assets/stylesheets/para/admin/src/_base.sass

@@ -40,9 +40,12 @@ body
     float: left
     line-height: 34px
 
+.admin-main-page-content
+  position: relative
+
 .page-content-wrap
-  background-color: #fff
   margin: 25px 10px 25px 10px
+  background-color: #fff
   +border-radius($border-radius-small)
   +material-box-shadow-soft
   padding: 25px

data/app/assets/stylesheets/para/admin/src/_breadcrumb.sass

@@ -7,11 +7,21 @@
 //## Just a override of bootstrap
 
 .breadcrumb
+  float: left
+  width: calc(100% - 90px)
+  max-height: 60px
+  margin: 0
+
   border: none
   +border-radius(0)
-  margin: 0
-  float: left
+
   li
+    max-width: 30%
+    height: 60px
+    overflow: hidden
+    text-overflow: ellipsis
+    white-space: nowrap
+
     a
       color: $breadcrumb-color
       font-size: 1em

data/app/assets/stylesheets/para/admin/src/_form.sass

@@ -57,20 +57,24 @@ legend
 //
 //##
 
+.form-control
+  font-size: 14px
+
 .form-inputs,
 .nested-one-field,
 .tab-pane
   +clearfix
   .form-group:last-of-type,
   .form-group:only-child,
-  .nested-one-field:last-of-type  
+  .nested-one-field:last-of-type
     margin-bottom: 0
 
 .nested-one-field
   margin-bottom: $form-group-margin-bottom
 
-.form-control
-  font-size: 14px
+.nested-input-title
+  &.has-error
+    color: $brand-danger
 
 
 //== Inputs outline
@@ -165,6 +169,21 @@ legend
     &:active:focus
       +box-shadow(none)
 
+//== Color picker
+//
+//##
+
+.input-group
+  &.color
+    max-width: 300px
+    .input-group-addon
+      padding: 0
+      padding-left: 5px
+      i
+        border: 1px solid #ccc
+        width: 25px
+        height: 25px
+
 //== Search form filter
 //
 //##

data/app/assets/stylesheets/para/admin/src/_navtabs.sass

@@ -7,22 +7,39 @@
 //##
 
 //** Add negative margin top if the nav tab is the frst content of the page
-.page-content-wrap 
-  .nav-tabs
+.page-content-wrap
+  .nav-tabs-wrapper
     margin-top: -25px
+
+  .nav-tabs
     +border-radius($border-radius-small)
-  .form-inputs  
-    .nav-tabs
+
+    &.affix
+      margin-top: 0
+      width: 100%
+      z-index: $zindex-navbar-fixed - 1
+      +material-box-shadow-soft(3)
+
+  .form-inputs
+    .nav-tabs-wrapper
       margin-top: 0
+
+    .nav-tabs
       +border-radius(0)
 
+  .panel-body
+    .nav-tabs-wrapper
+      margin-top: -25px
+
 //** Override bootstrap nav tabs
-.nav-tabs
-  background-color: $gray-lighter
+.nav-tabs-wrapper
   margin-right: -25px
   margin-left: -25px
   margin-bottom: 25px
 
+.nav-tabs
+  background-color: $gray-lighter
+
   > li > a
     color: $text-color
     border: none

data/app/assets/stylesheets/para/admin/src/_nested-many.sass

@@ -35,6 +35,11 @@
         display: block
         width: 100%
         padding: 30px
+        &:hover,
+        &:focus
+          background-color: #FAFAFA !important
+          border-color: #FAFAFA !important
+          +material-box-shadow-soft(2)
 
       &.open
         > .dropdown-menu

data/app/assets/stylesheets/para/admin/src/_nested_one.sass

@@ -8,14 +8,15 @@
 
 .form-group.nested_one
   label.control-label.nested_one
-    font-weight: 600
-    font-size: 21px
-    color: $blue-darker
-    text-transform: inherit
+    width: 100%
     margin-top: 15px
     margin-bottom: 15px
+    padding-bottom: 10px
+    border-bottom: 1px solid $gray-light
+    font-weight: 600
+    font-size: 18px
 
 .tab-pane
   > .form-group.nested_one
     label.control-label.nested_one
-      margin-top: 0
+      margin-top: 0

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

@@ -12,6 +12,7 @@ module Para
       layout 'para/admin'
 
       helper_method :current_admin
+      helper_method :admin_body_class
 
       def current_admin
         @current_admin ||= if Para.config.current_admin_method
@@ -27,6 +28,10 @@ module Para
 
       private
 
+      def admin_body_class
+        'admin'
+      end
+
       # Override cancan controlelr resource class to avoid attributes
       # assignation issues with resources
       #

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

@@ -28,7 +28,7 @@ module Para
       end
 
       def clone
-        new_resource = resource.deep_clone include: resource.class.cloneable_associations
+        new_resource = resource.deep_clone!
         new_resource.save!
 
         if new_resource.save

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

@@ -8,7 +8,8 @@ module Para
       def create
         job = @exporter.perform_later(
           model_name: @component.try(:model).try(:name),
-          search: params[:q]
+          search: params[:q],
+          params: params.permit(@exporter.params_whitelist).to_h
         )
 
         track_job(job)

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

@@ -0,0 +1,13 @@
+module Para
+  module Admin
+    class NestedFormsController < ComponentController
+      def show
+        @model = params[:model_name].constantize
+        @object = params[:id] ? @model.find(params[:id]) : @model.new
+        @object_name = params[:object_name]
+
+        render layout: false
+      end
+    end
+  end
+end

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

@@ -49,7 +49,7 @@ module Para
       def destroy
         resource.destroy
         flash_message(:success, resource)
-        redirect_to @component.path
+        redirect_to after_form_submit_path
       end
 
       def order
@@ -83,14 +83,25 @@ module Para
 
       def after_form_submit_path
         if params[:_save_and_edit]
-          { action: 'edit', id: resource.id, anchor: current_anchor }
+          host_redirect_params.merge(
+            action: 'edit',
+            id: resource.id,
+            anchor: current_anchor
+          )
         elsif params[:_save_and_add_another]
-          { action: 'new' }
+          host_redirect_params.merge(
+            action: 'new',
+            type: resource.try(:type)
+          )
         else
           params.delete(:return_to).presence || @component.path
         end
       end
 
+      def host_redirect_params
+        { subdomain: request.subdomain, domain: request.domain }
+      end
+
       def resource_model
         @resource_model ||= self.class.resource_model
       end

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

@@ -1,13 +1,15 @@
 module Para
   module Admin
     class SearchController < ApplicationController
-      include Para::ModelHelper
-      include Para::SearchHelper
-
       def index
+        # Parse ids that are provided as string into array
+        if params[:q] && params[:q][:id_in].is_a?(String)
+          params[:q][:id_in] = params[:q][:id_in].split(',')
+        end
+
         model = params[:model_name].constantize
-        attributes = model_field_mappings(model).fields
-        @results = model.ransack(fulltext_search_param_for(attributes) => params[:search]).result
+        @results = model.ransack(params[:q]).result
+
         render layout: false
       end
     end

data/app/decorators/para/component/base_decorator.rb

@@ -9,15 +9,20 @@ module Para
       end
 
       def relation_path(controller_or_resource, options = {})
-        if Hash === controller_or_resource
+        if controller_or_resource.is_a?(Hash)
           options = controller_or_resource
           controller_or_resource = nil
         end
 
         components = [:admin, self, controller_or_resource].compact
+
         find_path(components, options)
       end
 
+      def page_container_class
+        'col-xs-12'
+      end
+
       private
 
       # Try to find a polymorphic path for the given arguments
@@ -28,7 +33,7 @@ module Para
       #
       def find_path(path, options)
         safe_polymorphic_path(path, options).tap do |result|
-          raise result.class, result.message if Exception === result
+          raise result if result.is_a?(Exception)
         end
       end
 

data/app/decorators/para/component/crud_decorator.rb

@@ -28,6 +28,10 @@ module Para
         find_path(data, options)
       end
 
+      def page_container_class
+        history? ? 'col-md-8' : super
+      end
+
       private
 
       def extract_id_from(object)

data/app/decorators/para/component/form_decorator.rb

@@ -20,6 +20,12 @@ module Para
         find_path(data, options)
       end
 
+      def page_container_class
+        history? ? 'col-md-8' : super
+      end
+
+      private
+
       def action_option_for(options, nested: false)
         if !nested && options[:action].try(:to_sym) == :show
           nil

data/app/exporters/call_for_projects_votes_exporter.rb

@@ -0,0 +1,79 @@
+class CallForProjectsVotesExporter < Para::Exporter::Xls
+  attr_reader :call_for_projects
+
+  def name
+    'votes-appel-projets'
+  end
+
+  protected
+
+  def self.params_whitelist
+    [:call_for_projects_id]
+  end
+
+  def resources
+    resources = ActsAsVotable::Vote.joins(
+      "LEFT JOIN call_for_projects_applications " +
+        "ON call_for_projects_applications.id = votes.votable_id " +
+        "AND votes.votable_type = 'CallForProjectsApplication'"
+    ).includes(:voter, votable: :call_for_projects)
+
+    # Filter if available
+    resources = resources.where(
+      call_for_projects_applications: {
+        call_for_projects_id: params[:call_for_projects_id]
+      }
+    ) if params[:call_for_projects_id]
+
+    resources
+  end
+
+  # Defining the fields that you want to export will export all those fields
+  # directly to the XLS file
+  #
+  def headers
+    ['Appel à projets', 'Projet', 'E-mail', 'Nom', 'Prénom', 'Date du vote']
+  end
+
+  # If you need special behavior in the row generation (rendering associated
+  # models or other specific logic), you can return an array here that will
+  # be written to the XLS
+  #
+  # For safe XLS writing, use the #encode method on every string in the
+  # returned array.
+  #
+  # Example :
+  #
+  #   fields = [...]
+  #   fields.map!(&:encode)
+  #
+  def row_for(resource)
+    [
+      resource.votable.call_for_projects.title,
+      resource.votable.name,
+      resource.voter.email,
+      resource.voter.last_name,
+      resource.voter.first_name,
+      I18n.l(resource.created_at)
+    ]
+  end
+
+  # If you need complete control over you XLS generation, use the following
+  # method instead of the #fields or #row_for methods, and return a valid XLS
+  # StringIO object.
+  #
+  # A `#generate_workbook` method is provided, which will yield the workbook to
+  # you so you can just fill it, and then returns a StringIO that can be
+  # directly written to the Excel file.
+  #
+  # Please check the [Spreadsheet](https://github.com/zdavatz/spreadsheet) gem
+  # documentation for more informations about how to build your Excel document.
+  #
+  # def generate
+  #   generate_workbook do |workbook|
+  #     sheet = workbook.create_worksheet
+  #     sheet.row(0).concat ['data', 'row']
+  #     sheet.row(1).concat ['other', 'row']
+  #   end
+  # end
+end

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

@@ -39,9 +39,8 @@ module Para
       end
 
       def template_path_lookup(*paths)
-        paths.find do |path|
-          lookup_context.find_all(path).any?
-        end
+        path = paths.find { |path| lookup_context.find_all(path).any? }
+        path&.gsub(/\/_([^\/]+)\z/, '/\1')
       end
 
       def resource_title_for(resource)

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

@@ -0,0 +1,16 @@
+module Para
+  module Admin
+    module HistoryHelper
+      def history_for(component, action:, **options)
+        return unless component.history?
+
+        partial_path = find_partial_for(
+          (options[:resource] || options[:relation]),
+          "history/#{ action }"
+        )
+
+        render partial: partial_path, locals: options
+      end
+    end
+  end
+end

data/app/helpers/para/form_helper.rb

@@ -6,7 +6,15 @@ module Para
         wrapper: :vertical_form,
         wrapper_mappings: Para::SimpleFormConfig.wrapper_mappings,
         track_attribute_mappings: true,
-        html: { class: '', data: { :'para-form' => true } }
+        html: {
+          class: '',
+          data: { :'para-form' => true },
+          # Force multipart forms to allow forms with no file input on creation
+          # to fetch nested fields with image inputs through the remote nested
+          # form loading system. Without this option, rails does not create a
+          # multipart form when there is no file input during the form creation.
+          multipart: true
+        }
       }
 
       options = default_options.deep_merge(options)

data/app/helpers/para/model_helper.rb

@@ -16,8 +16,6 @@ module Para
         mappings = options.fetch(:mappings, {})
       end
 
-      store_key = ['model', 'mappings', model.name.underscore].join(':')
-
       Para::AttributeFieldMappings.new(
         model, whitelist_attributes: whitelist_attributes, mappings: mappings
       )