faalis 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90efe60cdb3bb64002f3545a2eeeb02a40c4de4d
-  data.tar.gz: 32afd51398aaf2fb0ce6eb3934b279e0ca1b6314
+  metadata.gz: 6cb432bbaba6c1a12a581c9acdd3814d89be3d0a
+  data.tar.gz: 93eae05d5c3b2be637c518425199ddd6909dd522
 SHA512:
-  metadata.gz: 58ca8d745e73ae6234c7a32833e3369d188f77716c8a05803942535d1d5f4f599e4f3cb64cbb479ab90db6f5234f977f9ea3c279a0ae66bd3c90be5a881c1d4c
-  data.tar.gz: 32ce491a58a3a9e0dedb1e00e12c26cb4952694bd4010f8d8a352a38d41fef4907fda3191a77e30734713b448b19c8633571be138873c452fb1e706b40619e70
+  metadata.gz: 1b6df7c4975998f16542761762fa7bf68ea5a38be13d1c991fe0daa8aa326b9c7b3e2259f6da96e97e36fc0c35ac8df2e3e44734eecdb497a10d276eeecad2bb
+  data.tar.gz: f791ceaf0a0874ae4d754950fdd7bce0839a7c7c3beb5777af267b96003d4f29d1e2be3b1d2f8ce5f9ed26e14f369f7b40b708eb6af58b93aa250a213cbc4e57

data/app/assets/javascripts/faalis/dashboard/modules/modules.js

@@ -27,11 +27,11 @@ Modules.controller("ModulesController", ["$location", "$scope", "$controller", "
                     }
                     // Check if user can pass the permission
                     if (User.can(menu.permission.action, menu.permission.model)) {
-                        debug("You have " + menu.permission.action + " permission on " + menu.permission.model);
+                        console.debug("You have " + menu.permission.action + " permission on " + menu.permission.model);
                         module.menu_items.push(menu);
                     }
                     else {
-                        debug("User don't have " + menu.permission.action + " permission on " + menu.permission.model);
+                        console.debug("User don't have " + menu.permission.action + " permission on " + menu.permission.model);
                     }
                 }
                 else {

data/app/assets/javascripts/faalis/dashboard/variables.js.erb

@@ -17,8 +17,3 @@ window.templates_path = "/templates/";
 // Any element of this queue will be appear as error after load event
 window.ErrorQueue = [];
 window.DashboardURL = "<%= url.dashboard_path %>";
-<% if Rails.env == "development" %>
-window.debug = true;
-<% else %>
-window.debug = false;
-<% end %>

data/app/controllers/faalis/api/v1/conversations_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "faalis/application_controller"
 
 module Faalis
-  class API::V1::ConversationsController < APIController
+  class API::V1::ConversationsController < ::APIController
     before_filter :authenticate_user!
     helper_method :mailbox, :conversation
 

data/app/controllers/faalis/api/v1/groups_controller.rb

@@ -1,13 +1,13 @@
 require_dependency "faalis/api_controller"
 
 module Faalis
-  class API::V1::GroupsController < APIController
+  class API::V1::GroupsController < ::APIController
     # TODO: Use strong params
     # TODO: implement authorization
 
     # GET /api/v1/groups
     def index
-      @groups = Group.includes(:permissions).all
+      @groups = Group.includes(:permissions).to_a
       authorize! :read, Faalis::Group
       respond_with(@groups)
     end

data/app/controllers/faalis/api/v1/logs_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "faalis/api_controller"
 
 module Faalis
-  class API::V1::LogsController < APIController
+  class API::V1::LogsController < ::APIController
 
     # GET /api/v1/logs
     def index

data/app/controllers/faalis/api/v1/permissions_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "faalis/application_controller"
 
 module Faalis
-  class API::V1::PermissionsController < APIController
+  class API::V1::PermissionsController < ::APIController
 
     class DummyPerm
       attr_accessor :model, :permission_type

data/app/controllers/faalis/api/v1/profiles_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "faalis/application_controller"
 
 module Faalis
-  class API::V1::ProfilesController < APIController
+  class API::V1::ProfilesController < ::APIController
 
     def show
       @user = current_user

data/app/controllers/faalis/api/v1/users_controller.rb

@@ -1,7 +1,7 @@
 require_dependency "faalis/application_controller"
 
 module Faalis
-  class API::V1::UsersController < APIController
+  class API::V1::UsersController < ::APIController
 
     def index
       @users = User.joins(:group).all

data/app/views/faalis/api/v1/groups/index.json.jbuilder

@@ -1,6 +1,6 @@
 json.array! @groups do |group|
   json.extract! group, :id, :name
-  json.permissions group.permissions do |json, permission|
+  json.permissions group.permissions do |permission|
     json.(permission, :string_repr)
   end
 end

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = "0.15.1"
+  VERSION = "0.16.0"
 end

data/lib/generators/faalis/js_scaffold_generator.rb

@@ -128,6 +128,14 @@ module Faalis
       # PRIVATES --------------------------------------------
       private
 
+      # check for parent
+      def parent?
+        if options[:parent] != ""
+          return true
+        end
+        false
+      end
+
       # Path to the resource
       def resource_path
         path_parts = resource_name.split("/")

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

@@ -27,15 +27,15 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
 
     // Add any route you need here
     $routeProvider.
-        when("<% if options[:parent] %>/<%= options[:parent] %>/:<%= options[:parent] %>_id<% end %>/<%= resource_url %>", {
+        when("<% if parent? %>/<%= options[:parent] %>/:<%= options[:parent] %>_id<% end %>/<%= resource_url %>", {
             templateUrl: template("<%= resource_path %>/index"),
             controller: "<%= resource %>Controller"
         }).
-        when("<% if options[:parent] %>/<%= options[:parent] %>/:<%= options[:parent] %>_id<% end %>/<%= resource_url %>/new",{
+        when("<% if parent? %>/<%= options[:parent] %>/:<%= options[:parent] %>_id<% end %>/<%= resource_url %>/new",{
             templateUrl: template("<%= resource_path %>/new"),
             controller: "Add<%= resource %>Controller"
         }).
-        when("<% if options[:parent] %>/<%= options[:parent] %>/:<%= options[:parent] %>_id<% end %>/<%= resource_url %>/:id/edit",{
+        when("<% if parent? %>/<%= options[:parent] %>/:<%= options[:parent] %>_id<% end %>/<%= resource_url %>/:id/edit",{
             templateUrl: template("<%= resource_path %>/new"),
             controller: "Add<%= resource %>Controller"
         });
@@ -47,7 +47,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
 <%= resource.pluralize %>.controller("<%= resource %>Controller", ["$scope", "gettext", "Restangular", "catch_error", "$location", "$routeParams",
                                       function($scope, gettext, API, catch_error, $location, $routeParams){
 
-    <% if options[:parent] %>
+    <% if parent? %>
     var <%= options[:parent] %>_id = $routeParams.<%= options[:parent] %>_id;
     <% end %>
     <% unless options[:no_filter] %>$scope.filter_config = {
@@ -98,7 +98,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
               name: "create",
               model: "<%= resource.classify %>"
             },
-            route: "#<% if options[:parent] %>/<%= options[:parent] %>/" + <%= options[:parent] %>_id + "<% end %>/<%= resource_url %>/new"
+            route: "#<% if parent? %>/<%= options[:parent] %>/" + <%= options[:parent] %>_id + "<% end %>/<%= resource_url %>/new"
 
          },<% unless options[:no_bulk] %>
         {
@@ -228,7 +228,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
 
 <%= resource.pluralize %>.controller("Add<%= resource %>Controller", ["Restangular", "$scope", "$location", "$routeParams", "gettext", "catch_error", function(API, $scope, $location, $routeParams, gettext, catch_error){
 
-    <% if options[:parent] %>
+    <% if parent? %>
     var <%= options[:parent] %>_id = $routeParams.<%= options[:parent] %>_id;
     <% end %>
 
@@ -281,7 +281,7 @@ var <%= resource.pluralize %> = angular.module("<%= resource %>", ["ListView", "
 
     $scope.cancel = function(){
         $(".form input").val("");
-        $location.path("#<% if options[:parent] %>/<%= options[:parent] %>/" + <%= options[:parent] %>_id + "<% end %>/<%= resource_url %>");
+        $location.path("#<% if parent? %>/<%= options[:parent] %>/" + <%= options[:parent] %>_id + "<% end %>/<%= resource_url %>");
     };
 
     $scope.save = function(save_another){

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Sameer Rahmani