faalis 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b17095e9f9209c16c8d641d36dfee75381a06469
-  data.tar.gz: 3cbc41e1c106775a84a1916d68d4e82772855e9d
+  metadata.gz: c6af04f0ddd2109f8688af7c8130368781645d83
+  data.tar.gz: 816f4033c96f1c871b20ef85845bb7bc105afbac
 SHA512:
-  metadata.gz: 548ee9b0d86567b06061097ef2651eb20308b0af1059c566d80d5c02a74acbe613c59feb044880a0e28c9d57a0093e941da81152483c392e484b417beedfe52c
-  data.tar.gz: 987451cd55ffe78f4b7af5855253a208b62c4044e143461bf299285566530eb9369aadfcdb544164151240bd384f9c9b2f178751312fa4103be31859c0e55b10
+  metadata.gz: d5105668ea3683a077fe1b5492af48bbede58f11e9f938964b1976966561f2f1a829846dd3248cc8344f003558df8f0a644bf38e992415f4a9914ca928d1edfe
+  data.tar.gz: 9a8797a854f7cdc93fcbc4d5da0e7a67c832c28bd52c3dbc207560453ee22ef3dc40b6c8d584c00240b69ac5450ab2fe86c76e6a043c9e2028feadf7154fd081

data/lib/faalis/generators/concerns.rb

@@ -7,3 +7,4 @@ require "faalis/generators/concerns/resource_fields"
 require "faalis/generators/concerns/resource_name"
 require "faalis/generators/concerns/angular"
 require "faalis/generators/concerns/tabs"
+require "faalis/generators/concerns/model"

data/lib/faalis/generators/concerns/model.rb

@@ -0,0 +1,29 @@
+module Faalis
+  module Generators
+    module Concerns
+      module Model
+
+        def self.included(base)
+          # Fields to use in in bulk edit, comma separated
+          base.class_option :model, :type => :string, :default => "", :desc => "Model name to use"
+
+        end
+
+        private
+
+        def model_specified?
+          not options[:model].empty?
+        end
+
+        def model
+          if model_specified?
+            options[:model]
+          else
+            ""
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/faalis/generators/dashboard_scaffold.rb

@@ -15,6 +15,7 @@ module Faalis
       include Faalis::Generators::Concerns::Parent
       include Faalis::Generators::Concerns::Angular
       include Faalis::Generators::Concerns::Tabs
+      include Faalis::Generators::Concerns::Model
 
 
       # Do not install specs

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = "0.18.0"
+  VERSION = "0.18.1"
 end

data/lib/generators/faalis/templates/api/controller.rb.erb

@@ -3,9 +3,9 @@ class API::V1::<%= resource.pluralize %>Controller < APIController
   <% if parent? %><% all_parents = parents %><% prev = all_parents.shift %>
   load_and_authorize_resource :<%= prev.singularize %>, :except => [:destory]
   <% all_parents.each do |p| %>load_and_authorize_resource :<%= p.singularize %>, :through => :<%= prev.singularize %>, :except => [:destory]<% prev = p %>
-  <% end %>load_and_authorize_resource :through => :<%= prev.singularize %>, :except => [:destory]
+  <% end %>load_and_authorize_resource :through => :<%= prev.singularize %>, :except => [:destory]<% if model_specified? %>, :class => "<%= model %>"<% end %>
   <% else %>
-  load_and_authorize_resource :except => [:destory]
+  load_and_authorize_resource :except => [:destory]<% if model_specified? %>, :class => "<%= model %>"<% end %>
   <% end %>
   # GET /api/v1/<%= resource.pluralize.underscore %>
   def index
@@ -51,7 +51,7 @@ class API::V1::<%= resource.pluralize %>Controller < APIController
   end
 
   def build_resource
-    @<%= resource.underscore %> = ::<%= resource %>.new(resource_params)
+    @<%= resource.underscore %> = <% if model_specified? %><%= model %><% else %>::<%= resource %><% end %>.new(resource_params)
     <% if parent? %>@<%= resource.underscore %>.<%= parents.last.singularize %> = <%= parents.last.singularize.camelize %>.find(params[:<%= parents.last.singularize %>_id])<% end %>
   end
 

data/lib/generators/faalis/templates/js/list_view/index.html.erb

@@ -55,7 +55,7 @@
     </div>
 </div>
 <% end %>
-<list-view buttons="buttons" model="'<%= resource %>'" objects="<%= resource.pluralize.underscore %>" title-attribute="'<%= options[:title_field] %>'" details-template="details_template" item-per-page="10" on_delete="on_delete" column_defs="columns">
+<list-view buttons="buttons" model="'<% if model_specified? %><%= model %><% else %><%= resource %><% end %>'" objects="<%= resource.pluralize.underscore %>" title-attribute="'<%= options[:title_field] %>'" details-template="details_template" item-per-page="10" on_delete="on_delete" column_defs="columns">
   <div class="small-6 column text-left clearpadding">
     <h3><i class="fa fa-group"></i> <span translate><%= resource.underscore.pluralize.humanize %></span></h3>
   </div>

data/lib/generators/faalis/templates/js/list_view/module.js.erb

@@ -51,7 +51,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
     $scope.<%= options[:parent] %>_id = $routeParams.<%= options[:parent] %>_id;
     <% end %>
     <% unless options[:no_filter] %>$scope.filter_config = {
-        list: API.all("<%= resource.pluralize.underscore %>")
+        list: <% if parent? %>API.<% parents.each do |parent| %>one("<%= parent %>", $scope.<%= parent %>_id)<% end %>.all("<%= resource.pluralize.underscore %>")<% else %>API.all("<%= resource.pluralize.underscore %>")<% end %>
     };
     $scope.<%= resource.pluralize.underscore %> = [];<% end %>
     <% unless options[:no_bulk] %>// Cache object for each field name possible values
@@ -96,7 +96,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
             classes: "btn tiny green",
             permission: {
               name: "create",
-              model: "<%= resource.classify %>"
+              model: "<% if model_specified? %><%= model %><% else %><%= resource.classify %><% end %>"
             },
             route: "#<% parents.each do |p| %>/<%= p %>/" + $scope.<%= p %>_id + "<% end %>/<%= resource_url %>/new"
 
@@ -107,7 +107,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
             classes: "btn tiny yellow",
             permission: {
               name: "update",
-              model: "<%= resource.classify %>"
+              model: "<% if model_specified? %><%= model %><% else %><%= resource.classify %><% end %>"
             },
             action: function(){
                 $scope.$apply("bulk_edit = ! bulk_edit");
@@ -120,7 +120,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
             classes: "btn tiny red",
             permission: {
               name: "create",
-              model: "<%= resource.classify %>"
+              model: "<% if model_specified? %><%= model %><% else %><%= resource.classify %><% end %>"
             },
             action: function(){
                 var selected = _.find($scope.<%= resource.pluralize.underscore %>, function(x){

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Sameer Rahmani
@@ -639,6 +639,7 @@ files:
 - lib/faalis/generators/concerns/tabs.rb
 - lib/faalis/generators/concerns/parent.rb
 - lib/faalis/generators/concerns/resource_fields.rb
+- lib/faalis/generators/concerns/model.rb
 - lib/faalis/generators/concerns/required.rb
 - lib/faalis/generators/concerns/menu.rb
 - lib/faalis/omniauth/callbacks.rb