faalis 1.0.0.alpha4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4142c1bbc7a9acf734840f8549f57bcbd1423197
-  data.tar.gz: 6bdc7be8afae5e8db1684a8e2034379f4528a3df
+  metadata.gz: 48423f7be005515dd296b6e41f13451db95aece8
+  data.tar.gz: 47ff6d348cb1af52a72a60ce5706d7ed011ace98
 SHA512:
-  metadata.gz: 86bafa8c2f59fd59482bcbd6d92d69bdb5ff07346e3010c65817849a111976a4de6465331fc95e0ecafe40f9c76e4c0275328cf0ad942687cdf0a9164e943f37
-  data.tar.gz: a1e0aa9ebed472d454a21949bb712054f4744afc9b5c0248266eca7f37d4b9fd0a3ca499319a0294bade56b6738d415536febc0b89feff63ab414b74f504bfbd
+  metadata.gz: 729d1153859a5a6235b732a3c6a192f98107c2ed2bddddf687789149988efdd71d80e3e36376b7ab63251eb92146f1820774915ea212ae73a37daf6a8532c1fd
+  data.tar.gz: 9680abe59e5b2884cabf106b32e2a4895cb48b4a45ac9361792567af212c6cf09deca9de97d8ca479b23bcc53c5156d2910ebb97837a2bfdb362d6b56ec7b175

data/app/assets/javascripts/faalis/angular-manifest.js

@@ -16,6 +16,7 @@
 //= require select2/select2
 //= require angular-ui-select2/select2
 //= require flow.js/flow
+//= require angular-loading-bar/loading-bar
 //= require ng-flow
 //= require faalis/dashboard/functions
 //= require_tree ./dashboard/lib

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

@@ -76,9 +76,8 @@ angular.element(document).ready(function(){
             url: API_PREFIX + "permissions/user"})
            .success(function(data, status, headers, config){
                PERMISSIONS = data.permissions;
-
                console.groupCollapsed('User Permissions');
-               console.log(data.permissions);
+               console.log(data);
                console.groupEnd();
 
                angular.bootstrap(document, ["Dashboard"]);

data/app/assets/javascripts/faalis/dashboard/controllers/group.js.coffee

@@ -13,10 +13,10 @@ Group.config ["$stateProvider", "ResourcesProvider",
         }).
         state("groups.new",{
           url: "/new",
-          templateUrl: template_url("auth/groups/new"),
+          templateUrl :template_url("auth/groups/new"),
           controller: "NewGroupController"
         }).
-        state("groups.edit",{
+        state("groups-edit",{
           url: "/:id/edit",
           templateUrl: template_url("auth/groups/new"),
           controller: "AddGroupController"
@@ -27,17 +27,19 @@ Group.config ["$stateProvider", "ResourcesProvider",
 ]
 
 
-Group.controller "NewGroupController", ["$state", "$rootScope", "$scope", "Resources", "$stateParams", "gettext",
-($state, $rootScope, $scope, Resources, $stateParams, _) ->
+Group.controller "NewGroupController", ["$state", "$rootScope", "$scope", "Restangular", "$stateParams", "gettext", "catch_error",
+($state, $rootScope, $scope, Resources, $stateParams, _, catch_error) ->
 
 
-  $scope.resource = Resources.main_resource()
   $scope.group = {}
 
   $rootScope.section_name = _("Groups")
   $rootScope.section_slug = _("Add")
 
-  resource.initialize($stateParams)
+  Resources.all('permissions').getList().then (data)->
+    console.log(data);
+    $scope.permissions = data[0].permissions
+  , (data)->
+    catch_error(data)
 
-  $scope.relations = resource.get_all_relations()
 ]

data/app/assets/javascripts/faalis/dashboard/controllers/user.js

@@ -0,0 +1,11 @@
+var User = angular.module("User", ["ListView", "Errors", "ui.router"]);
+
+User.config(["$stateProvider", function($stateProvider){
+
+    $stateProvider.
+        state("users", {
+            url: "/auth/users",
+            templateUrl: template("auth/users/index"),
+            controller: "UsersController"
+        });
+}]);

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

@@ -1,3 +1,35 @@
+
+//TODO: Use a js template engine in here
+function form_error(data) {
+  var msg = data.title + "<br/><ul>";
+  delete data.title;
+
+  //TODO: Replace this with *sugar*
+  _.each(_.keys(data), function(x){
+    msg += "<li>" + data[x] + "</li>";
+    $('input[name="' + x + '"], [data-name="' + x + '"]').addClass('has-error');
+  });
+
+  msg += "</ul>";
+
+  error_message(msg);
+}
+
+function redirect_to(target) {
+  var dashboard_namespace = "<%= Faalis::Engine.dashboard_namespace.to_s %>";
+  var uri = target.replace("/"+ dashboard_namespace + "/",
+                           "/" + dashboard_namespace + "#/");
+
+  console.log("Redirecting to: %s", uri);
+  window.location.href = uri;
+}
+
+function big_random() {
+  return Math.random(0,10)*100000000000000000;
+}
+
+// OLD FUCNTIONS ---------------------
+
 function add_dependency(module) {
 
     window.dashboard_dependencies = window.dashboard_dependencies || [];
@@ -111,6 +143,10 @@ function catch_error1(error){
     }
 };
 
+String.prototype.readable = function() {
+  return this.replace(/::/g, ' ').humanize();
+};
+
 $(function(){
     $("#flash").on("click", hide_flash);
     show_error_queue();

data/app/assets/javascripts/faalis/dashboard/lib/controllers/generic_index_controller.js.coffee

@@ -2,7 +2,7 @@
 # controller.
 class Faalis.GenericIndexController extends Faalis.BaseController
 
-  constructor: ($scope, _, Resources, $rootScope, $state, $stateParams, $user) ->
+  constructor: ($scope, _, Resources, $rootScope, $state, $stateParams) ->
     # Call constructor of **Faalis.BaseController** which maps all
     # the methods (prototype methods) of current object to $scope except of those that
     # their name starts with a '_' ( underscore ). Those methods are reserved for internal
@@ -18,7 +18,8 @@ class Faalis.GenericIndexController extends Faalis.BaseController
     @rootScope = $rootScope
     @state = $state
     @stateParams = $stateParams
-    @user = $user
+
+    $scope.__resource__ = @Resource
 
     @__init__()
     @__setup_buttons__()
@@ -62,7 +63,6 @@ class Faalis.GenericIndexController extends Faalis.BaseController
     @scope.buttons = []
 
     for button in @__buttons__()
-      if @user.can button.permission, @Resource.__name__
         @scope.buttons.push(button)
 
   # Fetch remote resource using API interface
@@ -75,11 +75,18 @@ class Faalis.GenericIndexController extends Faalis.BaseController
         scope[Resource.plural_name()] = data
         scope.$apply()
 
-  on_delete: (resources) ->
+  on_delete: (objects, resource, scope) ->
+    console.log(resource)
+    _.each(objects, (x) ->
+      console.log(x)
+      resource.destroy(x.id).then(
+      )
+      $('#tr-' + x.id).remove()
+    )
 
 
 
-Faalis.GenericIndexController.$inject = ["$scope", "gettext", "Resources", "$rootScope", "$state", "$stateParams", "$user"]
+Faalis.GenericIndexController.$inject = ["$scope", "gettext", "Resources", "$rootScope", "$state", "$stateParams"]
 
-angular.module('Faalis.Controllers', ["Faalis.ResourceFactory", "User"])
+angular.module('Faalis.Controllers', ["Faalis.ResourceFactory"])
   .controller("Faalis.GenericIndexController", Faalis.GenericIndexController)

data/app/assets/javascripts/faalis/dashboard/lib/fields/has_many_field.js.coffee

@@ -10,8 +10,6 @@ class Faalis.HasManyField extends Faalis.BaseField
     console.log(resource)
 
   __init__: ->
-    console.log("<<<<<<<<<<<<<<<<")
-    console.log(this)
     #console.log(@resource)
     return
     @resource = new @resource()

data/app/assets/javascripts/faalis/dashboard/lib/resource.js.coffee

@@ -101,17 +101,30 @@ class Faalis.Resource
       resource: resource
     }
 
+  edit_link: (object) ->
+    if @root_path
+      return @root_path + '/' + object.id;
+    else
+      return @to_path() + '/' + object.id;
+
   # Return the url of current `Resource`
   to_path: (params...) ->
+    _parents = @parents[0..]
+    return '/' + _parents.filter(Boolean).join('/') + @plural_name()
+
     if @_parents_values_is_set == false
       throw 'You need to set parents values to continue.'
 
-    _parents = @parents[0..]
+    if @parents.length > 0
+      _parents = @parents[0..]
 
-    for item in params
-      _parents.push(item)
+      if params.length > 1
+        for item in params
+          console.log(item)
+          _parents.push(item)
 
-    return '/' + _parents.filter(Boolean).join('/') + @plural_name()
+        console.log(_parents)
+        return '/' + _parents.filter(Boolean).join('/') + @plural_name()
 
   plural_name: ->
     @__name__.pluralize()

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

@@ -7,101 +7,5 @@ User.config(["$stateProvider", function($stateProvider){
             url: "/auth/users",
             templateUrl: template("auth/users/index"),
             controller: "UsersController"
-        }).
-        state("users.new",{
-            url: "/auth/users/new",
-            templateUrl: template("auth/users/new"),
-            controller: "AddUsersController"
-        }).
-        state("/auth/users/:id/edit",{
-            templateUrl: template("auth/users/new"),
-            controller: "AddUsersController"
         });
 }]);
-
-User.controller("UsersController", ["$scope", "Restangular","gettext", "catch_error",
-                                    function($scope, API, gettext, catch_error){
-
-    $scope.details_template = template("auth/users/details");
-
-    API.all("users").getList().then(function(data){
-        $scope.users = data;
-    });
-
-    $scope.buttons = [
-        {
-            title: gettext("New"),
-            icon: "fa fa-plus",
-            classes: "btn tiny green",
-            state: "#/auth/users/new"
-        }
-    ];
-
-
-    $scope.on_delete = function(users){
-        var query = [];
-        users.forEach(function(user){
-            query.push(user.id);
-        });
-
-        API.all("users").customDELETE(query.join(","))
-            .then(function(data) {
-
-                $scope.users = _.filter($scope.users, function(x){
-                    return !(query.indexOf(x.id) != -1);
-                });
-                success_message(data.msg);
-            })
-            .catch(catch_error);
-
-    };
-
-
-}]);
-
-
-User.controller("AddUsersController", ["$scope","Restangular","$location" ,"$stateParams", "gettext", "catch_error", function($scope, API, $location , $stateParams, gettext, catch_error){
-
-    API.all("groups").getList().then(
-        function(data){
-            $scope.groups = data;
-        });
-
-    $scope.obj_id = null;
-    if("id" in $stateParams){
-        $scope.obj_id = $stateParams.id;
-        var obj = API.one("users", $scope.obj_id).get()
-                .then(function(data){
-                    $scope.first_name = data.first_name;
-                    $scope.last_name = data.last_name;
-                    $scope.email = data.email;
-                    $scope.group = data.group;
-                    $scope.password = data.password;
-                });
-    }
-    $scope.save = function() {
-        var user = {
-            first_name: $scope.first_name,
-            last_name: $scope.last_name,
-            email: $scope.email,
-            password: $scope.password,
-            group: $scope.group
-        };
-        if ($scope.obj_id){
-            API.one("users",$scope.obj_id).patch(user).then(function(){
-                success_message(gettext("User updated successfully."));
-                $location.path("/auth/users");
-                });
-        }else{
-            API.all("users").post(user).then(function(){
-                success_message(gettext("User created Successfully"));
-                $location.path("/auth/users");
-            }).catch(catch_error);
-        }
-    };
-
-    $scope.cancel = function(){
-        $(".form input").val("");
-        $location.path("auth/users");
-    };
-}]);

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

@@ -0,0 +1,41 @@
+angular.module('Fake', [])
+  .config(['$stateProvider',  function($stateProvider){
+    $stateProvider
+      .state('fake-group-new', {
+        url: '/auth/groups/new',
+        templateUrl: '/dashboard/auth/groups/new'
+      })
+      .state('fake-group-edit', {
+        url: '/auth/groups/:id',
+        templateUrl: function($stateParams){
+          return '/dashboard/auth/groups/' + $stateParams.id + '?' + big_random();
+        }
+      })
+      .state('fake-user-index', {
+        url: '/auth/users',
+        templateUrl: '/dashboard/auth/users'
+      })
+      .state('fake-user-show', {
+        url: '/auth/users/:id',
+        templateUrl: function($stateParams){
+          return '/dashboard/auth/users/' + $stateParams.id + '?' + big_random();
+        }
+      })
+      .state('fake-user-edit', {
+        url: '/auth/users/:id/edit',
+        templateUrl: function($stateParams){
+          return '/dashboard/auth/users/' + $stateParams.id + '/edit?' + big_random();
+        }
+      })
+      .state('fake-user-edit-password', {
+        url: '/auth/users/:id/password',
+        templateUrl: function($stateParams){
+          return '/dashboard/auth/users/' + $stateParams.id + '/password?' + big_random();
+        }
+      })
+
+      .state('fake-user-new', {
+        url: '/auth/users/new',
+        templateUrl: '/dashboard/auth/users/new'
+      });
+  }]);

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

@@ -8,6 +8,7 @@ Datetime_.directive('datetimeField', ["$filter", "gettext",  function($filter, g
 
     function link(scope, element, attrs){
         var ltr = is_ltr();
+        var ltr = true;
         var locale = (ltr) ? 'en' : 'fa';
         scope.element_id = "id_" + scope.field;
         //TODO: change the find selector to use ID
@@ -31,7 +32,9 @@ Datetime_.directive('datetimeField', ["$filter", "gettext",  function($filter, g
 
         });
 
-        scope.$watch('fake_model', function(x, y) {
+        element.find('div.date input').bind('blur keyup change', function(){
+          scope.model = element.find('div.date input').val();
+            console.log( element.find('div.date input').val());
         });
     }
     // Actual object of <datetime-field> directive

data/app/assets/javascripts/faalis/dashboard/resources/group_resource.js.coffee

@@ -6,5 +6,6 @@ class @GroupResource extends Faalis.Resource
     new Faalis.StringField('title'),
     new Faalis.HasManyField('permissions', Faalis.PermissionResource)
   ]
+  root_path: '/dashboard#/auth/groups'
 
 Faalis.GroupResource = @GroupResource

data/app/assets/javascripts/faalis/dashboard/services/api.js.coffee

@@ -32,8 +32,9 @@ class Faalis.APIFactory
       .then (data) ->
         return data.data
       , (data) ->
-        @log.error(data)
-        @catch_error(data)
+        #@log.error(data)
+        console.log('Operation Failed.')
+        #@catch_error(data)
 
   # Raw queries -----------------------
   get: (url, params) ->
@@ -57,17 +58,18 @@ class Faalis.APIFactory
     @execute('GET', url)
 
   find: (id) ->
-    url = @resource.to_path(id)
+    url = @_resource.to_path(id)
     @execute('GET', url)
 
   create: (data) ->
-    url = @resource.to_path
+    url = @_resource.to_path
     @execute('POST', url, data)
 
   update: (id, data) ->
-    url = @resource.to_path(id)
+    url = @_resource.to_path(id)
     @execute('PUT', url, data)
 
   destroy: (id) ->
-    url = @resource.to_path(id)
+    url = @_resource.to_path(id)
+    url = url + '/' + id;
     @execute('DELETE', url)

data/app/assets/javascripts/faalis/dashboard/services/user.js.coffee

@@ -1,4 +0,0 @@
-User = angular.module("User")
-  .service "$user", ->
-    can: (object, perm)->
-      return true

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

@@ -21,4 +21,5 @@ window.Faalis = {};
 
 window.STATIC_REQUIREMENTS = ["gettext", "Modules", "ui.select2", 'Errors',
                               "ngAnimate", "ui.router", "restangular", "ngQuickDate",
-                              "Errors", "Profile", "Permissions", 'ng'];
+                              "Errors", "Profile", "Permissions", 'ng',
+                              'angular-loading-bar', 'Fake'];

data/app/assets/stylesheets/faalis/dashboard/ltr/application.css

@@ -1,9 +1,11 @@
-// require variables
+/* require variables
 // require bootstrap
 // require font-awesome
 // require AdminLTE
 // require base
 // require home
 
+//= require angular-loading-bar/loading-bar
 //= require dashstrap/dashboard/ltr/application
-//= require dashstrap/ltr/application
+//= require dashstrap/ltr/application
+*/