admin_it 1.1.0 → 1.2.0

data/app/views/admin_it/shared/_fields.html.slim

@@ -1,19 +1,40 @@
 - for_context ||= context
 
+- if for_context.child?
+  - parent_name = for_context.parent.resource.name
+  - parent_field = for_context.field(parent_name)
+  - if parent_field
+    input(
+      name=parent_name
+      value=parent_field.read(for_context.entity)
+      type="hidden"
+    )
+
+/ hidden fields
+- fields.each do |field|
+  - next if field.visible?
+  - locals = { field: field, for_context: for_context }
+  = render partial: File.join(%w(admin_it editors hidden)), locals: locals
+
+/ visible fields
 - fields.each do |field|
-  - name = "#{for_context.resource.name}[#{field.name}]"
-  - id = "#{for_context.resource.name}_#{field.name}"
-  - if field.visible?
-    div class="form-group"
-      label for="#{id}" class="col-sm-2 control-label"
-        = field.display_name
-      div class="col-sm-10"
-        input(
-          type="text"
-          class="form-control"
-          id==id
-          name==name
-          value==field.read(for_context.entity)
-        )
+  - if field.editor == :image
+    - locals = { field: field, for_context: for_context, id: "#{for_context.resource.name}_#{field.name}" }
+    = render partial: File.join(%w(admin_it editors hidden)), locals: locals
+    - next
+  - next unless field.visible?
+  - next if field == parent_field
+  - locals = { field: field, for_context: for_context }
+  - if field.partial.nil?
+    .form-group
+      - control_width = 'col-sm-12'
+      - if field.show_label?
+        - id = "#{for_context.resource.name}_#{field.name}"
+        label.col-sm-2.control-label for="#{id}"
+          = field.display_name
+          - control_width = 'col-sm-10'
+      div class=control_width
+        = render partial: File.join('admin_it', 'editors', field.editor.to_s), locals: locals
   - else
-    input type="hidden" name==name id==id value==field.read(for_context.entity)
+    = render partial: field.partial, locals: locals
+

data/app/views/admin_it/shared/_filters.html.slim

@@ -1,24 +1,23 @@
 - for_context ||= context
 
 - unless for_context.single? || for_context.filters.empty?
-  div class="row admin-it-filters"
-    ul class="nav nav-pills nav-stacked col-md-2"
+  .row.admin-it-filters
+    ul.nav.nav-pills.nav-stacked.col-md-2
       - for_context.filters.each do |filter, index|
         li class="#{filter == for_context.active_filter ? 'active' : ''}" data-toggle="popup"
           a href="##{filter.name}" data-toggle="pill"
             = filter.display_name
-            button(
-              class="btn btn-xs btn-danger pull-right fade"
+            button.btn.btn-xs.btn-danger.pull-right.fade(
               data-toggle="popup-target"
-              data-link==url_for(for_context.url_params(filters: "-#{filter.name}"))
+              data-link=url_for(for_context.url_params(filters: "-#{filter.name}"))
             )
-              i class="fa fa-times-circle"
+              i.fa.fa-times-circle
 
-    div class="well tab-content admin-it-filter-content col-md-10"
+    .well.tab-content.admin-it-filter-content.col-md-10
       - for_context.filters.each do |filter|
-        div(
-          class="tab-pane fade#{filter == for_context.active_filter ? ' in active' : ''}"
-          id==filter.name
+        div.tab-pane.fade(
+          class="#{filter == for_context.active_filter ? ' in active' : ''}"
+          id=filter.name
         )
           - filter.all_values.each do |v|
             - if filter.values.include?(v[:value])
@@ -33,8 +32,8 @@
                 filters: "!#{filter.name}(+#{filter.value(v[:value])})", \
                 active_filter: filter.name \
               ))
-            a class="label #{a_class}" href==href
+            a.label class="#{a_class}" href=href
               = v[:value].to_s + ' '
-              span class="badge"
+              span.badge
                 = v[:count].to_s
             = ' '

data/app/views/admin_it/shared/_form.html.slim

@@ -1,50 +1,66 @@
 - for_context ||= context
 
+- parent = for_context.child? ? for_context.parent : for_context
+- resource = for_context.resource
+
 - if for_context.is_a?(AdminIt::NewContext)
-  - action = for_context.resource.collection_path
+  - action = resource.collection_path
 - elsif for_context.is_a?(AdminIt::EditContext)
-  - action = for_context.resource.single_path(for_context.entity)
-
-form(
-  class="form-horizontal"
-  role="form"
-  action==action
-  method="POST"
-)
-  input name="authenticity_token" type="hidden" value==form_authenticity_token
-  - if for_context.is_a?(AdminIt::EditContext)
-    input name="_method" type="hidden" value="patch"
+  - action = resource.single_path(for_context.entity)
+
+/ images
+- for_context.fields(scope: { editor: :image }).each do |field|
+  - locals = { field: field, for_context: for_context }
+  = render partial: File.join(%w(admin_it editors image)), locals: locals
 
+form.form-horizontal role="form" action=action method="POST"
+  input name="authenticity_token" type="hidden" value=form_authenticity_token
+  input name="section" type="hidden" value=parent.section
   - if for_context.child?
-    input name="redirect" type="hidden" value="test"
+    input name="parent" type="hidden" value=for_context.parent.to_link
+  - if for_context.is_a?(AdminIt::EditContext)
+    input name="_method" type="hidden" value="patch"
 
   - if for_context.sections.size > 0
-    ul class="nav nav-tabs"
+    ul.nav.nav-tabs
       - for_context.sections.each do |section|
         li class="#{section.name == for_context.section ? 'active' : ''}"
           a href="##{section.name}" data-toggle="tab"
+            - if section.icon?
+              i.fa> class="fa-#{section.icon}"
             = section.display_name
-    div class="tab-content"
+    .tab-content
       - for_context.sections.each do |section|
-        div class="tab-pane #{section.name == for_context.section ? 'active' : ''}" id==section.name
-          - if section.fields.size > 0
+        .tab-pane class="#{section.name == for_context.section ? 'active' : ''}" id=section.name
+          - if !section.renderable?
             - fields = for_context.fields.select do |f|
               - section.fields.include?(f.name)
             = render partial: File.join(%w(admin_it shared fields)), \
                      locals: { fields: fields }
           - else
-            - c = section.render(for_context.entity, for_context)
-            - if c.is_a?(AdminIt::Context)
-              = render partial: File.join(%W(admin_it shared child)), \
-                       locals: { for_context: for_context, child: c }
+            - rendered = section.render(for_context.entity, for_context)
+            - rendered = [rendered] unless rendered.is_a?(Array)
+            - rendered.each do |item|
+              - if item.is_a?(AdminIt::Context)
+                = render partial: File.join(%W(admin_it shared child)), \
+                         locals: { for_context: for_context, child: item }
+              - elsif item.is_a?(AdminIt::Partial)
+                - locals = item.locals.merge(for_context: for_context)
+                = render partial: item.name, locals: locals
+              - elsif item.is_a?(String)
+                == item
   - else
     = render partial: File.join(%w(admin_it shared fields)), \
              locals: { fields: for_context.fields(scope: :all) }
 
   - content_for :buttons do
-    button class="btn btn-primary" = t('admin_it.action.save')
+    button.btn.btn-primary type="submit" = t('admin_it.action.save')
 
   - if for_context.layout.empty?
-    div class="form-group"
-      div class="col-sm-10 col-sm-offset-2"
+    .form-group
+      .col-sm-10.col-sm-offset-2
         = yield :buttons
+
+.modal.fade#child_modal
+  .modal-dialog.modal-lg
+    .modal-content

data/app/views/admin_it/shared/_pagination.html.slim

@@ -1,18 +1,14 @@
 - for_context ||= context
 
 - if for_context.pages > 1
-  div class="text-center"
-    ul class="pagination"
+  .text-center
+    ul.pagination
       - if for_context.page == 1
-        li.disabled: a href="#"
-          i class="fa fa-angle-double-left"
-        li.disabled: a href="#"
-          i class="fa fa-angle-left"
+        li.disabled: a href="#": i.fa.fa-angle-double-left
+        li.disabled: a href="#": i.fa.fa-angle-left
       - else
-        li: a href="#{url_for(page: 'first')}"
-          i class="fa fa-angle-double-left"
-        li: a href="#{url_for(page: 'prev')}"
-          i class="fa fa-angle-left"
+        li: a href="#{url_for(page: 'first')}": i.fa.fa-angle-double-left
+        li: a href="#{url_for(page: 'prev')}": i.fa.fa-angle-left
       - start = 1
       - if for_context.pages > 10
         - start = for_context.page - 5 if for_context.page > 5
@@ -30,12 +26,8 @@
            for_context.page < for_context.pages - 5
         li.disabled: a href="#" ...
       - if for_context.page == for_context.pages
-        li.disabled: a href="#"
-          i class="fa fa-angle-right"
-        li.disabled: a href="#"
-          i class="fa fa-angle-double-right"
+        li.disabled: a href="#": i.fa.fa-angle-right
+        li.disabled: a href="#": i.fa.fa-angle-double-right
       - else
-        li: a href="#{url_for(page: 'next')}"
-          i class="fa fa-angle-right"
-        li: a href="#{url_for(page: 'last')}"
-          i class="fa fa-angle-double-right"
+        li: a href="#{url_for(page: 'next')}": i.fa.fa-angle-right
+        li: a href="#{url_for(page: 'last')}": i.fa.fa-angle-double-right

data/app/views/admin_it/shared/_toolbar.html.slim

@@ -1,15 +1,22 @@
 - for_context ||= context
 
-<!-- toolbar -->
+/! admin_it_#{for_context.resource.name}_toolbar
 - if for_context.collection?
   - new_context = for_context.resource.contexts.find do |c|
     - c <= AdminIt::NewContext
+
+  / add button
   - unless new_context.nil?
-    = for_context.toolbar.button t('admin_it.action.create'), \
-                                 add_class: 'btn-success', \
-                                 link: new_context.path, \
-                                 icon: 'plus'
-  - if resource.collections.size > 1
+    - opts = { add_class: 'btn-success', icon: 'plus' }
+    - if for_context.child?
+      - opts[:dialog] = '#child_modal'
+      - opts[:link] = new_context.url(parent: for_context.parent, layout: :dialog)
+    - else
+      - opts[:link] = new_context.url
+    = for_context.toolbar.button t('admin_it.action.create'), opts
+
+  / collection context select
+  - if resource.collections.size > 1 && !for_context.child?
     - for_context.toolbar.buttons(class: 'pull-right') do |buttons|
       - resource.collections.each do |collection|
         - btn_class = ['btn-default']
@@ -18,14 +25,15 @@
                          link: collection.path, \
                          icon: collection.icon
 
-  - unless for_context.all_filters.empty?
+  / filters
+  - unless for_context.all_filters.empty? || for_context.child?
     - for_context.toolbar.buttons(class: 'pull-right admin-it-filters') do |buttons|
       = buttons.button add_class: 'btn-info dropdown-toggle', \
                        add_data: { toggle: 'dropdown' }, \
                        link: '#', icon: 'filter' do |button|
-        = t('admin_it.filters') + ' '
-        span class="caret"
-      ul class="dropdown-menu" role="menu"
+        = t('admin_it.filters')
+        span.caret<
+      ul.dropdown-menu role="menu"
         - for_context.all_filters.each do |filter|
-          li: a href==for_context.url_for(filters: filter.filter_name)
+          li: a href=for_context.url_for(filters: filter.filter_name)
             = filter.display_name

data/app/views/layouts/admin_it.html.slim

@@ -17,21 +17,29 @@ html
     = javascript_include_tag 'jquery', 'jquery_ujs', 'turbolinks'
     = javascript_include_tag 'admin_it/bootstrap.min', \
                              'data-turbolinks-track' => true
+
+    / JQuery FileUpload
+    = stylesheet_link_tag 'jquery.fileupload'
+    = stylesheet_link_tag 'jquery.fileupload-ui'
+    = javascript_include_tag 'jquery.ui.widget'
+    = javascript_include_tag 'jquery.fileupload'
+    = javascript_include_tag 'jquery.fileupload-ui'
+    = javascript_include_tag 'jquery.fileupload-process'
+
     = javascript_include_tag 'admin_it/admin_it'
 
-  - html = capture do
-    body style="padding-top: 70px"
-      nav class="navbar navbar-fixed-top navbar-inverse" role="navigation"
-        div class="container"
-          <!-- top-menu -->
-
-      div class="container admin-it-#{context.name}"
-        = render File.join(%w(admin_it shared toolbar))
-        = render File.join(%w(admin_it shared filters))
-        = yield
-
-  - top_menu_html = capture { context.top_menu.render }
-  - toolbar_html = capture { context.toolbar.render }
-  = html.gsub('<!-- top-menu -->', top_menu_html) \
-        .gsub('<!-- toolbar -->', toolbar_html) \
-        .html_safe
+    = yield :head
+
+  body style="padding-top: 70px"
+    nav.navbar.navbar-fixed-top.navbar-inverse role="navigation"
+      .container
+        <!-- admin_it_top_menu -->
+
+    .container class="admin-it-#{context.name}"
+      = render File.join(%w(admin_it shared toolbar))
+      = render File.join(%w(admin_it shared filters))
+      = yield
+
+    = yield :footer
+
+  - context.end_render(self)

data/app/views/layouts/admin_it_dialog.html.slim

@@ -1,8 +1,8 @@
-div class="modal-header"
+.modal-header
   h4.modal-title = yield :title
-div class="modal-body admin-it-#{context.name}"
+.modal-body class="admin-it-#{context.name}"
   = yield
-div class="modal-footer"
-  button type="button" class="btn btn-default" data-dismiss="modal"
+.modal-footer
+  button.btn.btn-default type="button" data-dismiss="modal"
     = t('admin_it.action.close')
   = yield :buttons

data/config/routes.rb

@@ -18,4 +18,7 @@ AdminIt::Engine.routes.draw do
         controller: "admin_it/#{name}",
         action: resource.default_context)
   end
+
+  # generates signed urls for S3
+  resources :signed_url, only: :index
 end

data/lib/admin_it.rb

@@ -22,5 +22,6 @@ require File.join %w(admin_it filters)
 require File.join %w(admin_it resource)
 require File.join %w(admin_it context)
 require File.join %w(admin_it controller)
+require File.join %w(admin_it middleware)
 require File.join %w(admin_it engine)
 require File.join %w(admin_it helpers)

data/lib/admin_it/config.rb

@@ -21,5 +21,14 @@ module AdminIt
       end
       @controller = value
     end
+
+    def self.s3
+      @s3 ||= {}
+    end
+
+    def self.s3=(value)
+      fail ArgumentError, 'Wrong S3 options' unless value.is_a?(Hash)
+      @s3 = value
+    end
   end
 end

data/lib/admin_it/context/context.rb

@@ -7,6 +7,14 @@ require File.join %w(extend_it callbacks)
 module AdminIt
   using EnsureIt if EnsureIt.refined?
 
+  class Partial
+    attr_reader :name, :locals
+    def initialize(name, **locals)
+      @name = name
+      @locals = locals
+    end
+  end
+
   #
   class Context
     extend ExtendIt::Base
@@ -63,9 +71,14 @@ module AdminIt
       false
     end
 
-    def self.url(context = nil, **params)
-      url = context.nil? ? path : context.path
+    def self.url(*args, **params)
+      context = nil
+      args.reject! { |arg| arg.is_a?(Context) ? context = arg : false }
+      url = context.nil? ? path(*args) : context.path(*args)
       params = context.nil? ? params : context.url_params(**params)
+      if params.key?(:parent) && params[:parent].is_a?(Context)
+        params[:parent] = params[:parent].to_link
+      end
       unless params.empty?
         url << '?' << params.map { |k, v| "#{k}=#{v}" }.join('&')
         url = URI.escape(url)
@@ -84,12 +97,17 @@ module AdminIt
     \z/x
 
     def initialize(from, params: nil, store: nil, parent_init: false)
+      @children = []
+
       run_callbacks :initialize do
         if from.is_a?(self.class.controller_class)
           @controller = from
         elsif from.is_a?(Context)
           @controller = from.controller
-          self.parent = from unless parent_init == true
+          unless parent_init == true
+            self.parent = from
+            from.instance_variable_get(:@children) << self
+          end
           params ||= {}
           store ||= {}
         end
@@ -103,7 +121,7 @@ module AdminIt
           store = store[name] ||= {}
         end
 
-        params = controller.request.query_parameters if params.nil?
+        params = controller.request.params if params.nil?
         params = Hash[params.map { |k, v| [k.to_sym, v] }]
 
         run_callbacks :load, arguments: { params: params, store: store } do
@@ -125,22 +143,33 @@ module AdminIt
       @name ||= self.class.context_name
     end
 
-    def field(name)
-      @fields.find { |f| f.name == name }
-    end
-
     def fields(scope: :visible)
+      values = @fields
+      if scope.is_a?(Hash)
+        if scope.key?(:editor)
+          return values.select { |f| f.editor == scope[:editor] }
+        end
+      end
       case scope
-      when nil, :all then @fields
-      when :visible then @fields.select { |f| f.visible? }
-      when :hidden then @fields.select { |f| !f.visible? }
-      when :readable then @fields.select { |f| f.readable? }
-      when :writable then @fields.select { |f| f.writable? }
-      when Field::TYPES then @fields.select { |f| f.type == scope }
-      else @fields
+      when nil, :all then values
+      when :visible then values.select { |f| f.visible? }
+      when :hidden then values.select { |f| !f.visible? }
+      when :readable then values.select { |f| f.readable? }
+      when :writable then values.select { |f| f.writable? }
+      when :sortable then values.select { |f| f.sortable? }
+      when :with_labels then values.select { |f| f.show_label? }
+      when :without_labels then values.select { |f| !f.show_label? }
+      when Field::TYPES then values.select { |f| f.type == scope }
+      else values
       end
     end
 
+    def field(name)
+      name = name.ensure_symbol
+      @fields.find { |f| f.name == name }
+    end
+
+
     def save(**params)
       return if controller.nil?
       session = controller.session
@@ -193,11 +222,24 @@ module AdminIt
     def begin_render(template)
       @template = template
       @toolbar = Helpers::Toolbar.new(template)
-      @top_menu = Helpers::TopMenu.new(template, class: 'navbar-nav')
+      unless child?
+        @top_menu = Helpers::TopMenu.new(template, class: 'navbar-nav')
+      end
+    end
+
+    def end_render(template)
+      request = AdminIt::Request.get(controller.request)
+      request["admin_it_#{resource.name}_toolbar"] = template.capture do
+        @toolbar.render
+      end
+      unless child?
+        request['admin_it_top_menu'] = template.capture { @top_menu.render }
+#        @children.each { |c| c.end_render(template) }
+      end
     end
 
     def url_params(**params)
-      params.merge!(parent: @parent.send(:context_param)) unless @parent.nil?
+      params.merge!(parent: @parent.to_link) unless @parent.nil?
       params
     end
 
@@ -206,12 +248,16 @@ module AdminIt
       @template.url_for(*args, url_params(**params))
     end
 
-    protected
+    def partial(name, **locals)
+      Partial.new(name, **locals)
+    end
 
-    def context_param
+    def to_link
       "#{resource.name}/#{name}"
     end
 
+    protected
+
     def load_context; end
   end
 end