itsf_backend 2.2.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2018c783ed7049debdea9e3a99cba8625d44b217
-  data.tar.gz: 2f9e9480e0f37242ef5df7f7aec3915857ebf0e9
+  metadata.gz: b47d47f7ec14b4bb2f5fe787602a69a0c9286949
+  data.tar.gz: e04584cf360c901603f0168fb839c12ba5ac3a73
 SHA512:
-  metadata.gz: 03a30ab60bf9dbc5d76aca544e7099558aac41761fffaa1107891109ff92284436648ec81537e00c144299ebf0a5077bc904ffc5ab5a340606029fd42df1106e
-  data.tar.gz: 5c9ef7e87174a159c20b0a8871efa32ee2be677244b4325fe8b713fe34224bd07cabf444a01989e115de3e1faeb8a92b802fd6546b52fff10977ce5ad4e12b1f
+  metadata.gz: c00692d6a894a14e54a64753b3b79278b75fff021f41ab3768097348f405b51194a629daae2add53dca337d6d21b960cfcf5852ce3fe201ad494822e8a594a1b
+  data.tar.gz: 2e57fdf91245162efda51d802d72153f8cf7502c33f0e97f6c3f8fa43f2d31716468b0485842eed938589e52e495a241048e5a426c9961e2cd7a88dae89925f2

data/app/assets/javascripts/itsf/backend/application.js

@@ -13,6 +13,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui
+//= require turbolinks
 //= require twitter/bootstrap
 //= require ace-rails-ap
 //= require cocoon

data/app/assets/javascripts/itsf/backend/application/ui_autocomplete.js.coffee

@@ -1,16 +1,16 @@
-$ ->
- $('.ui-autocomplete-input').each ->
-  element = $(this)
-  target = $(this).attr('data-source-url')
+$(document).on 'turbolinks:load', ->
+  $('.ui-autocomplete-input').each ->
+    element = $(this)
+    target = $(this).attr('data-source-url')
 
-  element.autocomplete
-    source: target
-    minLength: 2
-    html: true
-    open: (event, ui) ->
-      $('.ui-autocomplete').css 'z-index', 1000
-      return
-    create: ->
-      $(this).data('ui-autocomplete')._renderItem = (ul, item) ->
-        $("<li>").append("<span>" + item.title + "<br><small>" + item.subtitle + "</small></span>").appendTo ul
-  return
+    element.autocomplete
+      source: target
+      minLength: 2
+      html: true
+      open: (event, ui) ->
+        $('.ui-autocomplete').css 'z-index', 1000
+        return
+      create: ->
+        $(this).data('ui-autocomplete')._renderItem = (ul, item) ->
+          $("<li>").append("<span>" + item.title + "<br><small>" + item.subtitle + "</small></span>").appendTo ul
+    return

data/app/concerns/routing/itsf_backend_resource_concern.rb

@@ -0,0 +1,34 @@
+module Routing
+  module ItsfBackendResourceConcern
+    extend ActiveSupport::Concern
+    # Using this method instead of resources, adds member routes for pages added in the
+    # itsf_backend configuration.
+    # 
+    def backend_resources(*args, &block)
+      resources(*args, &block)
+
+      # additional_member_actions = (Itsf::Backend::Configuration.default_resource_pages - [:show])
+
+      # if additional_member_actions.any?
+      #   resources_name = args.first
+      #   resources resources_name, only: [] do
+      #     member do
+      #       additional_member_actions.each do |action|
+      #         get action
+      #       end
+      #     end
+      #   end
+      # end
+
+      additional_resource_route_blocks = Itsf::Backend::Configuration.additional_resource_route_blocks
+      if additional_resource_route_blocks.any?
+        resources_name = args.first
+        additional_resource_route_blocks.each do |route_block|
+          resources resources_name, only: [] do
+            route_block.call(self)
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/controller/collection_links_concern.rb

@@ -0,0 +1,15 @@
+module Controller
+  module CollectionLinksConcern
+    extend ActiveSupport::Concern
+
+    included do
+      helper_method :collection_links
+    end
+
+    private
+
+    def collection_links
+      Itsf::Backend.collection_links
+    end
+  end
+end

data/app/controllers/concerns/controller/resource_links_concern.rb

@@ -0,0 +1,26 @@
+module Controller
+  module ResourceLinksConcern
+    extend ActiveSupport::Concern
+
+    # included do
+    #   helper_method :resource_pages
+    # end
+
+    # private
+
+    # def resource_pages
+    #   # Itsf::Backend::Configuration.default_resource_pages + 
+    #   Itsf::Backend::Configuration.resource_pages.map { |arp| arp.respond_to?(:call) ? arp.call(self) : arp.to_sym }.compact
+    # end
+
+    included do
+      helper_method :resource_links
+    end
+
+    private
+
+    def resource_links
+      Itsf::Backend.resource_links
+    end
+  end
+end

data/app/controllers/itsf/backend/resource/base_controller.rb

@@ -18,6 +18,8 @@ module Itsf::Backend
     include Controller::PaginationConcern if Itsf::Backend.features?(:kaminari)
     include Controller::JsonApiConcern
     include Controller::FeatureFlagsConcern
+    include Controller::ResourceLinksConcern
+    include Controller::CollectionLinksConcern
     helper Itsf::Backend::ApplicationHelper
     helper MultiClientHelper if Itsf::Backend.features?(:multi_client)
     
@@ -31,6 +33,10 @@ module Itsf::Backend
       name.gsub('Controller', '').singularize.constantize
     end
 
+      def self.resource_count
+        resource_class.count
+      end
+
     def resource_class
       self.class.resource_class
     end

data/app/controllers/itsf/backend/service/base_controller.rb

@@ -13,6 +13,7 @@ module Itsf::Backend
     include Controller::ServiceUrlsConcern
     include Controller::ServiceActionsConcern
     include Controller::JsonApiConcern
+    include Controller::FeatureFlagsConcern
     helper Itsf::Backend::ApplicationHelper
 
     layout 'itsf/backend/base'

data/app/policies/itsf/backend/engine_policy.rb

@@ -5,9 +5,9 @@ module Itsf::Backend
       allowed = user.respond_to?(:allowed_to?) ? user.allowed_to?(permission_identifier) : false
 
       if allowed
-        Rails.logger.debug "User #{user} is allowed to access #{permission_identifier}"
+        Rails.logger.debug "User #{user.try_all(*Itsf::Backend.resource_title_methods)} is allowed to access #{permission_identifier}"
       else
-        Rails.logger.debug "User #{user} is not allowed to access #{permission_identifier}"
+        Rails.logger.debug "User #{user.try_all(*Itsf::Backend.resource_title_methods)} is not allowed to access #{permission_identifier}"
       end
       allowed
     end

data/app/views/itsf/backend/resource/base/_collection_pages_navigation.html.haml

@@ -0,0 +1,10 @@
+%ul.nav.nav-tabs
+  - collection_links.each do |collection_link|
+    - if collection_link[:condition].call(self)
+      - if current_page? collection_link[:target].call(self)
+        %li.active{ role: :presentation }
+          = collection_link[:link_to].call(self)
+      - else
+        %li{ role: :presentation }
+          = collection_link[:link_to].call(self)
+  = render 'additional_collection_tabs', collection: collection

data/app/views/itsf/backend/resource/base/_form.html.haml

@@ -1,5 +1,5 @@
 - resource_class.attribute_names.delete_if { |name| Itsf::Backend.hidden_attributes_for[:edit].include?(name.to_sym) }.each do |name|
-  - if form.object.class.columns_hash[name].type == :hstore
+  - if form.object.class.columns_hash[name].try(:type) == :hstore
     = simple_fields_for name do |hstore_form|
       - if form.object.send(name).respond_to?(:each)
         - form.object.send(name).each do |key, value|

data/app/views/itsf/backend/resource/base/_resource_pages_navigation.haml

@@ -0,0 +1,10 @@
+%ul.nav.nav-tabs
+  - resource_links.each do |resource_link|
+    - if resource_link[:condition].call(self)
+      - if current_page? resource_link[:target].call(self)
+        %li.active{ role: :presentation }
+          = resource_link[:link_to].call(self)
+      - else
+        %li{ role: :presentation }
+          = resource_link[:link_to].call(self)
+  = render 'additional_resource_tabs', resource: resource

data/app/views/itsf/backend/resource/base/_show_extra_actions.html.haml

@@ -0,0 +1,25 @@
+- if features?(:audited)
+  .well.well-sm
+    - if @resource.version.nil?
+      - previous_version = @resource.audits.last.try(:version)
+      - next_version = nil
+    - else
+      - previous_version = @resource.version > 0 ? @resource.version - 1 : nil
+      - next_version     = @resource.version < @resource.audits.count ? @resource.version + 1 : nil
+
+
+    - if previous_version
+      = link_to(url_for(action: 'version', version: previous_version), class: 'btn btn-primary btn-responsive') do
+        %span.glyphicon.glyphicon-chevron-left
+        %span.btn-text= t('.previous')
+
+    .pull-right
+      - if next_version
+        = link_to(url_for(action: 'version', version: next_version), class: 'btn btn-primary btn-responsive') do
+          %span.glyphicon.glyphicon-chevron-right
+          %span.btn-text= t('.next')
+
+      - if @resource.version == @resource.audits.count
+        = link_to(url_for(action: :show), class: 'btn btn-primary btn-responsive') do
+          %span.btn-text= t('.actual')
+          %span.glyphicon.glyphicon-chevron-right

data/app/views/itsf/backend/resource/base/index.html.haml

@@ -14,11 +14,15 @@
                 %span.btn-text= t('.new', inflections)
           - rescue ActionController::UrlGenerationError
 
+#collection-pages-naviation.bottom-margin-1
+  = render 'collection_pages_navigation', collection: @collection
+
 .panel.panel-default.panel-with-actions
-  - if features?(:kaminari)
-    .panel-heading
-      .pull-right.form-inline
+  .panel-heading
+    .pull-right.form-inline
+      - if features?(:kaminari)
         = select_tag(:per_page, options_for_select({ '1': 1, '5': 5, '10': 10, '15': 15, '20': 20, '50': 50, '100': 100, t('.all') => 'all' }, (params[:per_page] || Itsf::Backend::Configuration.default_pagination_size)), 'data-select-pagination-size': true, id: 'pagination-size', class: 'form-control input-xs')
+      - if features?(:dragtable)
         = button_tag(t('.reset_column_order'), class: 'btn btn-default btn-xs', data: { 'reset-column-order': true})
   - if features?(:ransack)
     .panel-body
@@ -36,7 +40,9 @@
               = f.submit
               
   .table-responsive
-    = render_collection(@collection, resource_class, as: :bootstrap_table, table_html_options: { class: 'table table-responsive table-condensed table-striped table-hover dragtable' }) do |table|
+    - table_classes = %w(table table-responsive table-condensed table-striped table-hover)
+    - table_classes << 'dragtable' if features?(:dragtable)
+    = render_collection(@collection, resource_class, as: :bootstrap_table, table_html_options: { class: table_classes.join(" ") }) do |table|
       = render 'table', table: table
       = render 'table_actions', table: table
 

data/app/views/itsf/backend/resource/base/show.html.haml

@@ -1,5 +1,8 @@
 %p#notice= notice
 
+#resource-pages-naviation.bottom-margin-1
+  = render 'resource_pages_navigation', resource: @resource
+
 #page-title.bottom-margin-1
   .row
     .col-xs-8
@@ -11,6 +14,8 @@
             %span.glyphicon.glyphicon-fire
             %span.btn-text= t('.destroy')
 
+= render 'show_extra_actions', resource: @resource
+
 .panel.panel-default.panel-with-actions
   %table.table.table-striped.table-condensed.table-hover
     = render_resource(@resource, as: :bootstrap_attribute_table) do |table|

data/app/views/layouts/itsf/backend/_vertical_navigation.haml

@@ -17,5 +17,5 @@
                 - if !Itsf::Backend.features?(:pundit) || policy(resource_klass).index?
                   = link_to(send(engine.engine_name).url_for(controller: "/#{kontroller.controller_path}"), class: 'list-group-item') do
                     = resource_klass.model_name.human(count: :other)
-                    %span.badge.badge-default= resource_klass.count
+                    %span.badge.badge-default= kontroller.resource_count.respond_to?(:call) ? instance_exec(&kontroller.resource_count) : kontroller.resource_count
 

data/config/initializers/extend_action_dispatch_routing_mapper.rb

@@ -0,0 +1 @@
+ActionDispatch::Routing::Mapper.send(:include, Routing::ItsfBackendResourceConcern)

data/config/locales/de.yml

@@ -81,6 +81,8 @@ de:
           new:
             back: "Zurück"
             title: "%{resource_name} erstellen"
+          resource_pages_navigation:
+            show: 'Details'
           show:
             back: "Zurück"
             destroy: "Löschen"

data/lib/itsf/backend/configuration.rb

@@ -21,6 +21,9 @@ module Itsf
         { index: [], show: [], edit: [] }
       end
       mattr_accessor(:default_pagination_size) { 15 }
+      mattr_accessor(:resource_links) { [] }
+      mattr_accessor(:collection_links) { [] }
+      mattr_accessor(:additional_resource_route_blocks) { [] }
 
       def registered_controllers
         backend_engines.call.collect do |engine|

data/lib/itsf/backend/features.rb

@@ -6,7 +6,8 @@ module Itsf
       end
 
       def features?(name)
-        Gem::Specification.find_all_by_name(name.to_s).any? && Itsf::Backend::Configuration.enabled_features.include?(name)
+        # Gem::Specification.find_all_by_name(name.to_s).any? && Itsf::Backend::Configuration.enabled_features.include?(name)
+        Itsf::Backend::Configuration.enabled_features.include?(name)
       end
     end
   end

data/lib/itsf/backend/version.rb

@@ -1,5 +1,5 @@
 module Itsf
   module Backend
-    VERSION = '2.2.1'
+    VERSION = '3.0.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itsf_backend
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -500,15 +500,18 @@ files:
 - app/assets/stylesheets/itsf_backend.css
 - app/concerns/enumerable/acts_as_paginatable_resource_concern.rb
 - app/concerns/enumerable/acts_as_resource_concern.rb
+- app/concerns/routing/itsf_backend_resource_concern.rb
 - app/concerns/routing/service_concern.rb
 - app/controllers/concerns/controller/acts_as_list_concern.rb
 - app/controllers/concerns/controller/acts_as_published_concern.rb
 - app/controllers/concerns/controller/awesome_nested_set_concern.rb
+- app/controllers/concerns/controller/collection_links_concern.rb
 - app/controllers/concerns/controller/feature_flags_concern.rb
 - app/controllers/concerns/controller/pagination_concern.rb
 - app/controllers/concerns/controller/pundit_authorization_failure_handling_concern.rb
 - app/controllers/concerns/controller/pundit_namespaced_authorize_concern.rb
 - app/controllers/concerns/controller/ransack_concern.rb
+- app/controllers/concerns/controller/resource_links_concern.rb
 - app/controllers/concerns/controller/rest_actions_concern_with_pundit.rb
 - app/controllers/itsf/backend/application_controller.rb
 - app/controllers/itsf/backend/dashboard_controller.rb
@@ -547,14 +550,19 @@ files:
 - app/views/itsf/backend/home/_index_extras.html.haml
 - app/views/itsf/backend/home/index.html.haml
 - app/views/itsf/backend/i18n/_navigation.html.haml
+- app/views/itsf/backend/resource/base/_additional_collection_tabs.html.haml
+- app/views/itsf/backend/resource/base/_additional_resource_tabs.html.haml
+- app/views/itsf/backend/resource/base/_collection_pages_navigation.html.haml
 - app/views/itsf/backend/resource/base/_form.html.haml
 - app/views/itsf/backend/resource/base/_form_buttons.haml
 - app/views/itsf/backend/resource/base/_form_errors.html.haml
 - app/views/itsf/backend/resource/base/_head_extras.html.haml
 - app/views/itsf/backend/resource/base/_index_extras.html.haml
+- app/views/itsf/backend/resource/base/_resource_pages_navigation.haml
 - app/views/itsf/backend/resource/base/_scopes.html.haml
 - app/views/itsf/backend/resource/base/_search.html.haml
 - app/views/itsf/backend/resource/base/_show.html.haml
+- app/views/itsf/backend/resource/base/_show_extra_actions.html.haml
 - app/views/itsf/backend/resource/base/_show_extras.html.haml
 - app/views/itsf/backend/resource/base/_table.html.haml
 - app/views/itsf/backend/resource/base/_table_actions.html.haml
@@ -580,6 +588,7 @@ files:
 - app/views/layouts/itsf/backend/_vertical_navigation.haml
 - app/views/layouts/itsf/backend/base.html.haml
 - config/initializers/assets.rb
+- config/initializers/extend_action_dispatch_routing_mapper.rb
 - config/initializers/extend_object.rb
 - config/initializers/extend_ransack_form_builder.rb
 - config/initializers/extend_simple_form_form_builder.rb