faalis 1.0.0.alpha4 → 1.0.0

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

@@ -1,2 +1,4 @@
+//= require angular-loading-bar/loading-bar
+
 //= require dashstrap/dashboard/rtl/application
 //= require dashstrap/rtl/application

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

@@ -3,6 +3,7 @@ require_dependency "faalis/application_controller"
 module Faalis
   class API::V1::PermissionsController < ::APIController
 
+    skip_after_action :verify_authorized
     respond_to :json
 
     class DummyPerm
@@ -14,7 +15,7 @@ module Faalis
     def index
       @permissions = {}
 
-      Faalis::Permission.each do |perm|
+      Faalis::Permission.all.each do |perm|
         if @permissions.include? perm.model
           @permissions[perm.model] << perm.action
         else

data/app/controllers/faalis/api_controller.rb

@@ -24,9 +24,6 @@ module Faalis
   # which inherit from this class.
   class APIController < Faalis::ApplicationController
 
-
-    include Pundit
-
     # Only support `json` format
     respond_to :json
 

data/app/controllers/faalis/application_controller.rb

@@ -17,6 +17,9 @@
 #    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 # -----------------------------------------------------------------------------
 class Faalis::ApplicationController < ActionController::Base
+
+  include Pundit
+
   include FastGettext::Translation
 
   before_filter :set_locale

data/app/controllers/faalis/dashboard/groups_controller.rb

@@ -0,0 +1,80 @@
+class Faalis::Dashboard::GroupsController < ::ApplicationController
+  layout false
+
+  before_action :get_all_permissions, only: [:new, :edit]
+
+  def new
+    authorize Faalis::Group
+    @group = Faalis::Group.new
+  end
+
+
+  def edit
+    @group = Faalis::Group.find(params[:id])
+    authorize @group
+  end
+
+  def create
+    authorize Faalis::Group
+
+    name = group_params[:name]
+    @group = Faalis::Group.new(name: name, role: name.underscore)
+
+    @group.permissions = populate_permissions
+
+    respond_to do |f|
+      if @group.save
+        f.js
+        f.html
+      else
+        f.js { render :errors }
+        f.html
+      end
+    end
+
+  end
+
+  def update
+    @group = Faalis::Group.find(params[:id])
+    authorize @group
+
+    @group.permissions = populate_permissions
+    @group.name        = group_params[:name]
+    @group.role        = group_params[:name].underscore
+
+    respond_to do |f|
+      if @group.save
+        f.js
+        f.html
+      else
+        f.js { render :errors }
+        f.html
+      end
+    end
+  end
+
+  private
+
+  def populate_permissions
+    unless group_params[:permissions].nil?
+      # TODO: Fix this for mongoid too.
+      ids = group_params[:permissions].keys.map(&:to_i)
+      Faalis::Permission.where(id: ids)
+    end
+  end
+
+  def group_params
+    params.require(:group).permit!
+  end
+
+  def get_all_permissions
+    @permissions = {}
+    Faalis::Permission.all.each do |perm|
+      if @permissions.include? perm.model
+        @permissions[perm.model] << [perm.permission_type, perm.id]
+      else
+        @permissions[perm.model] = [[perm.permission_type, perm.id]]
+      end
+    end
+  end
+end

data/app/controllers/faalis/dashboard/users_controller.rb

@@ -0,0 +1,100 @@
+class Faalis::Dashboard::UsersController < ::ApplicationController
+  layout false
+
+  def index
+    authorize Faalis::User
+    @users = Faalis::User.all
+  end
+
+  def new
+    authorize Faalis::User
+    @user   = Faalis::User.new
+    @groups = Faalis::Group.all
+  end
+
+  def show
+    @user = Faalis::User.find(params[:id])
+    authorize @user
+  end
+
+  def edit
+    @user   = Faalis::User.find(params[:id])
+    @groups = Faalis::Group.all
+    authorize @user
+  end
+
+  def create
+    authorize Faalis::User
+    group_ids = user_params[:groups]
+
+    @user = Faalis::User.new(user_params)
+    @user.groups = Faalis::Group.where(id: group_ids)
+
+    respond_to do |f|
+      if @save.save
+        f.js
+        f.html
+      else
+        f.js { render :errors }
+        f.html
+      end
+    end
+  end
+
+  def update
+    parameters = user_params
+    group_ids  = parameters.delete(:groups).map(&:to_i)
+
+    @user = Faalis::User.find(params[:id])
+    authorize @user
+
+    @user.groups = Faalis::Group.where(id: group_ids)
+    @user.save
+
+    respond_to do |f|
+      if @user.update_without_password(parameters)
+        f.js
+        f.html
+      else
+        f.js { render :errors }
+        f.html
+      end
+    end
+  end
+
+  def edit_password
+    @user = Faalis::User.find(params[:id])
+    authorize @user, :update?
+  end
+
+  def update_password
+    @user = Faalis::User.find(params[:id])
+    authorize @user, :update?
+
+    respond_to do |f|
+      if @user.update(password_params)
+        f.js
+        f.html
+      else
+        f.js { render :errors }
+        f.html
+      end
+    end
+  end
+
+  def destroy
+  end
+
+  private
+
+  def password_params
+    params.require(:user).permit(:password, :password_confirmation)
+  end
+
+  def user_params
+    params.require(:user).permit(:first_name,
+                                 :last_name,
+                                 :email,
+                                 groups: [])
+  end
+end

data/app/controllers/faalis/dashboard_controller.rb

@@ -13,7 +13,11 @@ module Faalis
 
     def jstemplate
       if user_signed_in?
-        logger.info "#{'JS_TEMPLATE'.yellow}: angular/#{params[:path]}"
+
+        js_template = 'JS_TEMPLATE'
+        js_template.yellow if String.respond_to? :colorize
+
+        logger.info "#{js_template}: angular/#{params[:path]}"
         render template: "angular/#{params[:path]}", layout: nil
       else
         render :login_required_page

data/app/helpers/faalis/users_helper.rb

@@ -1,4 +1,8 @@
 module Faalis
   module UsersHelper
+    def faalisify_url(url)
+      dashboard = Faalis::Engine.dashboard_namespace
+      return url.gsub("/#{dashboard}/", "/#{dashboard}#/")
+    end
   end
 end

data/app/models/faalis/concerns/user/permission.rb

@@ -4,6 +4,11 @@ module Faalis
   module Concerns::User::Permission
     extend ActiveSupport::Concern
 
+    def member_of?(group)
+      @group_ids ||= self.groups.all.map(&:id)
+      @group_ids.include? group.id
+    end
+
     def have_permission? action, obj
       perm = self.groups.includes(:permissions)
         .where(faalis_permissions: { model: obj, permission_type: action })

data/app/models/faalis/group.rb

@@ -35,5 +35,19 @@ module Faalis
     def self.policy_class
       GroupPolicy
     end
+
+    def include_permission?(perm)
+      if perm.is_a? Fixnum
+        permission_ids.include? perm
+      else
+        permission_ids.include? perm.id
+      end
+    end
+
+    private
+
+    def permission_ids
+      @permission_ids ||= permissions.map(&:id)
+    end
   end
 end

data/app/models/faalis/permission.rb

@@ -34,5 +34,8 @@ module Faalis
       "#{self.permission_type.to_s}|#{self.model}"
     end
 
+    def model_name
+      model.underscore.humanize
+    end
   end
 end

data/app/views/angular/auth/groups/details.html

@@ -1,21 +1,2 @@
-<div class="details">
-<p>
-  <b translate>Group Name :</b>{{this.object.name}}
-</p>
-
-<p>
-  <b translate>Permissions :</b>
-  <ul>
-      <li ng-repeat="perm in this.object.permissions">{{ perm.string_repr }}</li>
-  </ul>
-</p>
-
-<ul class="button-group float-right">
-  <a ng-href="#/auth/groups/{{ this.object.id }}/edit" class="small">
-    <span class="fa fa-edit"></span> <span translated>Edit</span>
-  </a>
-  <!--<a ng-href="#/auth/groups/{{ this.object.id }}" class="small">
-    <span class="fa fa-eye"></span><span translated>Show</span>-->
-  </a>
-</ul>
-</div>
+<h1>TODO: You have to either use a template gem like 'dashstrap' or override this templates in your code base</h1>
+<h2>/auth/groups/details</h2>

data/app/views/angular/auth/groups/index.html

@@ -1,5 +1,2 @@
-<list-view buttons="buttons" objects="groups" title-attribute="'name'" details-template="details_template" item-per-page="10" on_delete="on_delete">
-  <div class="small-6 column text-left clearpadding">
-    <h3><i class="fa fa-group"></i> <span translate>Groups</span></h3>
-  </div>
-</list-view>
+<h1>TODO: You have to either use a template gem like 'dashstrap' or override this templates in your code base</h1>
+<h2>/auth/groups/index</h2>

data/app/views/angular/auth/groups/new.html

@@ -1,47 +1,2 @@
-<div class="newform">
-  <form name="from" novalidate>
-
-    <fieldset class="form">
-
-      <legend ng-if="!editing"><span translate>New Group</span></legend>
-      <legend ng-if="editing"><span translate>Edit Group</span></legend>
-
-      <div class="row">
-        <div class="small-4 columns">
-          <label translate>Name :</label>
-          <input id="id_name" ng-model="new_name" type="text" required>
-          <small id="id_name_msg"></small>
-        </div>
-      </div>
-    </fieldset>
-
-    <fieldset>
-      <legend translate>Advance Permissions</legend>
-      <div class="row">
-        <label for="permissions" translate>Permissions</label>
-      </div>
-
-      <div class="small-10 columns permissions">
-
-        <div class="row">
-          <div id="id_permissions" class="small-8 columns field">
-            <ul>
-
-              <li ng-repeat="permission in permissions" id="{{permission.name}}" ng-click="select_permission(permission)"> <i ng-show="is_selected(permission)" class="fa fa-check"></i> {{ permission.string }} </li>
-
-            </ul>
-          </div>
-          <small id="id_permissions_msg"></small>
-        </div>
-      </div>
-    </fieldset>
-
-    <div class="row">
-      <div class="small-6 columns">
-        <button class="btn small green" ng-click="save()" ng-disabled="form.$invalid"><i class="fa fa-check"></i> <span translate>Save</span></button>
-        <button class="btn small red" ng-click="cancel()"><i class="fa fa-times"></i><span translate>Cansel</span></button>
-      </div>
-    </div>
-  </form>
-
-</div>
+<h1>TODO: You have to either use a template gem like 'dashstrap' or override this templates in your code base</h1>
+<h2>/auth/groups/new</h2>

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 |permission|
-    json.(permission, :to_s)
+json.cache! ['v1', @groups], expires_in: 1.days do
+  json.array! @groups do |group|
+    json.extract! group, :id, :name
+    json.permissions Hash[group.permissions.group_by(&:model).map { |k, v| [k, v.map(&:permission_type)]}]
   end
 end

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

@@ -1 +1 @@
-json.permissions @permissions
+json.array! [{ permissions:  @permissions }]

data/app/views/faalis/dashboard/groups/_form.html.slim

@@ -0,0 +1,72 @@
+div
+  = form_tag(form_target, remote: true, method: method) do
+    .row
+      .col-sm-12.col-lg-9
+        .box.box-primary
+          .box-header
+            .box-title
+              - if @group.new_record?
+                = _('New Group')
+              - else
+                = _('Edit Group')
+
+          .box-body
+            .row
+              .col-sm-12.col-lg-6
+                .form-group data-name="role"
+                  label for="group_name"
+                    = ('Group name')
+
+                  input#group_name.form-control[placeholder==(_('Enter the name of group you want to create')) name="group[name]" type="text" required value=(@group.name)]
+
+
+
+      .col-sm-12.col-lg-3
+        .box
+          .box-header
+            .box-title
+              = _('Groups to use as template')
+    .row
+      .col-sm-12.col-lg-9
+        .box.box-warning
+          .box-header
+            .box-title
+              = _("Permissions")
+
+          .box-body
+            .row
+              .col-xs-12
+                table.table.table-striped
+                  tbody
+                    tr
+                      th.col-md-4
+                        = _('Entity Name')
+                      th.col-md-8
+                        = _('Permission')
+
+                    - @permissions.each do |perm, actions|
+                      tr
+                        td.col-md-4
+                          = perm.gsub('::',' ').humanize
+                        td.col-md-8
+                            - actions.each do |action|
+                              span.col-sm-3
+                                - if @group.include_permission? action[1]
+                                  input[type="checkbox" checked name=("group[permissions][#{action[1]}]") label=(_(action[0].humanize()))]
+                                    = action[0].humanize()
+                                - else
+                                  input[type="checkbox" name=("group[permissions][#{action[1]}]") label=(_(action[0].humanize()))]
+                                    = action[0].humanize()
+
+    .row
+      .col-sm-2
+        button.btn.btn-primary.btn-block type="submit"
+          i.fa.fa-check
+          |
+          = _('Save')
+
+      .col-sm-2
+
+        div.btn.btn-danger.btn-block onclick=("redirect_to('#{index}')")
+          i.fa.fa-times
+          = _('Cancel')