faalis 2.1.1 → 2.2.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9a8467c27e4b5bc5e97650d84280a5b47a063f1
-  data.tar.gz: 5e44dc7ea9f1a5e6f1cb29a3a28ada7842652f29
+  metadata.gz: fa58084bc0e95c18463f7121531662edd065c2b6
+  data.tar.gz: 83a3adcc22686c1a0d9ea788c28adeedd5b91c17
 SHA512:
-  metadata.gz: 2eae75d88cfe139f49133237edd7e962d3d3fb53be8de0dab5fdd7b3cb239a63387a06f72142b7635f7faf80728172858ca3e6578e3f11dd2a93b445590ad6f4
-  data.tar.gz: 5e04d9cbe4eab5e06d5dd5f0243641d0708ac579af95cb06fc86eaf01f97430febce7b3d05ac44a4a4d9f8bb1439dec3416a0e4e365652fd9ebf8f41b60fe166
+  metadata.gz: 6bcdd30638560c823282dfbf382ce4de9aa8c196c604e95a54c7cac2fd2a4f4064bb96c4f2bc4e235529b75c87b071baae2c698e729fe811e21813a7928f4ce8
+  data.tar.gz: 9600c5a45d27d5b44a872228116350954606a081186bbb809a48effe4b3959db1d99943d6a59bd275dbdeccdf9d54d55f7d34eeb3d848aef32a4e41dc286cb24

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

@@ -17,7 +17,7 @@
 //= require turbolinks
 
 // Misc ---------------------------
-//= require sugar/sugar-full.development
+//= require sugar
 
 // JQuery Libraries ---------------
 //= require admin_lte/admin_lte

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

@@ -1,7 +1,6 @@
 # Setup select2 for selects with multiple class
 setup_select2 = ->
-  $("select.multiple.select").select2()
-
+  $("select.multiple.select").select2({tags:[]})
 setup_icheck = ->
   $('input').iCheck {
     labelHover: false,

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

@@ -0,0 +1,5 @@
+//= link dashboard/application.js
+//= link  faalis/dashboard/ltr/application.css
+//= link  faalis/dashboard/rtl/application.css
+//= link  faalis/simple/ltr/application.css
+//= link  faalis/simple/rtl/application.css

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

@@ -5,7 +5,7 @@
 //= require turbolinks
 
 // Misc ---------------------------
-//= require sugar/sugar-full.development
+//= require sugar
 
 // JQuery Libraries ---------------
 //= require admin_lte/admin_lte

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

@@ -5,17 +5,19 @@
 //= require faalis/dashboard/share
 //= require_self
 
-.fa {
-   padding-right: 0.4em;
+.btn span {
+  padding-left: 0.4em;
 }
 
 .user-image {
   display: inline !important;
 }
+
 .user-name-span {
   width: 100%;
   display: inline !important;
 }
+
 .dropdown.user.user-menu {
   width: auto;
 }

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

@@ -5,3 +5,7 @@
 //= require faalis/dashboard/share
 //= require faalis/dashboard/rtl/base
 //= require_self
+
+.btn span {
+  padding-right: 0.4em;
+}

data/app/assets/stylesheets/faalis/dashboard/share.scss

@@ -54,3 +54,9 @@
   margin-left: 5px;
   margin-right: 5px;
 }
+
+html, body, .wrapper {
+  min-height: 100% !important;
+  height: 100% !important;
+  overflow-y: scroll;
+}

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

@@ -42,7 +42,6 @@ module Faalis::Dashboard
     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

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

@@ -24,10 +24,14 @@ module Faalis::Dashboard
     end
 
     def create
+
       authorize Faalis::User
-      group_ids = user_params[:groups]
+      #group_ids = user_params[:groups]
 
-      @user = Faalis::User.new(user_params)
+      parameters = user_params
+      groups     = parameters.delete(:groups)
+      @user = Faalis::User.new(parameters)
+      group_ids    = groups.map(&:to_i)
       @user.groups = Faalis::Group.where(id: group_ids)
 
       respond_to do |f|

data/app/helpers/faalis/dashboard_helper.rb

@@ -3,9 +3,10 @@ require_dependency 'faalis/dashboard/helpers/box_helpers'
 module Faalis
   module DashboardHelper
     include Faalis::Dashboard::Helpers::BoxHelpers
-
+    include ::ActionView::Helpers::TranslationHelper
     def form_label(resource, name)
-      ::I18n.t("forms.#{@resource.class.name.underscore.to_s.gsub('/', '.')}.#{name}")
+      key = "forms.#{@resource.class.name.underscore.to_s.gsub('/', '.')}.#{name}"
+      t(key)
     end
 
     def localized_time(time)
@@ -19,15 +20,13 @@ module Faalis
       href       = options.fetch(:href, '#')
       remote     = options.fetch(:remote, false).to_s
 
-      button = "<a class='#{classes}' href='#{href}'" +
-               "data-disable-with='#{title} . . .' data-remote='#{remote}'" +
-               "data-disable-class='disabled'>"
+      button = "<a class='#{classes}' href='#{href}' data-remote='#{remote}'>"
 
       if icon_class
         button += "<i class='fa fa-#{icon_class}'></i>"
       end
 
-      button += title + '</a>'
+      button += "<span>#{title}</span>" + '</a>'
 
       button.html_safe
     end
@@ -40,7 +39,7 @@ module Faalis
         klass   = button.fetch(:class, 'btn-success')
         remote  = button.fetch(:remote, false).to_s
         icons   = button.fetch(:icon_class, "")
-        label   = button.fetch(:label, '')
+        label   = button.fetch(:name, '')
         model   = button.fetch(:model, nil)
         action  = button.fetch(:policy, nil)
 
@@ -58,8 +57,8 @@ module Faalis
 
     # Translate route name to url dynamically
     def get_url(route_name, id = nil, engine = Rails.application)
-      return engine.routes.url_helpers.send(route_name, { id: id.to_s }) unless id.nil?
-      engine.routes.url_helpers.send(route_name)
+      return route_name.call if id.nil?
+      return route_name.call(id) unless id.nil?
     end
 
     def draw_menu(menu)

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

@@ -9,6 +9,11 @@ module Faalis
       @group_ids.include? group.id
     end
 
+    # TODO: merge this method and `member_of?`
+    def member_of_group?(group_name)
+      !self.groups.find_by(name: group_name).nil?
+    end
+
     def has_permission? action, obj
       perm = self.groups.includes(:permissions)
         .where(faalis_permissions: { model: obj, permission_type: action })
@@ -23,11 +28,11 @@ module Faalis
     alias_method :can?, :has_permission?
 
     def has_ownership?(record)
-      has_permission? :ownership, record.class.to_s
+      has_permission? :ownership, record.name
     end
 
     def owned?(record)
-      if has_permission? :ownership, record.class.to_s
+      if has_permission? :ownership, record.name
         if record.respond_to? :user
           return true if record.user == self
           return false

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

@@ -1,20 +1,24 @@
 module Faalis
   # This concern contains all the role related methods
   # to use within `Faalis::User`
-  module Concerns::User::UserRoles
+  module Concerns
+    module User
+      module UserRoles
 
-    # Return an array of user roles.
-    def roles
-      self.groups.to_a.map(&:role)
-    end
+        # Return an array of user roles.
+        def roles
+          self.groups.to_a.map(&:role)
+        end
 
-    def role? role
-      roles.include? role.to_s
-    end
+        def role? role
+          roles.include? role.to_s
+        end
 
-    # A shortcut for `role? :admin`
-    def admin?
-      role? :admin
+        # A shortcut for `role? :admin`
+        def admin?
+          role? :admin
+        end
+      end
     end
   end
 end

data/app/models/faalis/user_message.rb

@@ -1,5 +1,6 @@
 module Faalis
   class UserMessage < ActiveRecord::Base
+    include ::Faalis::Concerns::Authorizable
     belongs_to :sender, class_name: 'Faalis::User'
     belongs_to :reciever, class_name: 'Faalis::User'
   end

data/app/policies/faalis/application_policy.rb

@@ -39,12 +39,16 @@ class Faalis::ApplicationPolicy
     attr_reader :user, :scope
 
     def initialize(user, scope)
-      @@user = @user
+      @user = user
       @scope = scope
     end
 
     def resolve
-      scope
+      if @user.has_ownership?(scope)
+        scope.where(user: @user)
+      else
+        scope
+      end
     end
   end
 

data/app/views/faalis/dashboard/resource/create.js.erb

@@ -1,3 +1,3 @@
 success_message('<%= @_msg || t("faalis.dashboard.create_success_msg", resource: @resource_title) %>');
-var target = '<%= get_url(@index_route, @resource.id,  @engine) %>';
+var target = '<%= get_url(@index_route, nil,  @engine) %>';
 redirect_to(target);

data/app/views/faalis/dashboard/resource/index.html.slim

@@ -20,7 +20,7 @@
           |
         .box-tools.hidden-print
           - if policy(@resources.model).create?
-            = link_button(t("faalis.dashboard.index_view.new_button", title: t("resources.#{@resources.model.name.underscore}")), remote: false, href: get_url(@new_route, nil, @engine), classes: 'btn-success', icon_class: 'plus')
+            = link_button(t("faalis.dashboard.index_view.new_button", title: t("resources.#{@resources.model.name.underscore}")), remote: false, href: get_url(@new_route, nil, @engine), classes: 'btn-success btn-flat', icon_class: 'plus fa-lg')
 
           = action_buttons(@_action_buttons)
 
@@ -51,6 +51,7 @@
                       i.fa.fa-remove.fa-lg.btn-remove
 
                     - @_tools_buttons.each do |btn_name, btn|
+
                       a id=("tool_button_#{btn_name}") class=("link pull-left btn btn-xs #{btn[:class] || 'btn-default'}") href=(btn[:block].call(resource)) data-remote=("#{btn[:remote]}")
                         i class=("fa #{btn[:icon_class]}")
                         = btn_name

data/app/views/faalis/dashboard/resource/update.js.erb

@@ -1,3 +1,3 @@
 success_message('<%= @_msg || t("faalis.dashboard.edit_success_msg", resource: @resource_title) %>');
-var target = '<%= get_url(@index_route, @resource.id, @engine) %>';
+var target = '<%= get_url(@index_route, nil, @engine) %>';
 redirect_to(target);

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

@@ -48,7 +48,7 @@
               .form-group data-name="groups"
                 label
                   = t('faalis.group.groups')
-                select.multiple.select.form-control name="user[groups]" multiple="multiple"
+                select.multiple.select.form-control name="user[groups][]" multiple="multiple"
                   - @groups.each do |group|
                     - if @user.member_of? group
                       option[value=(group.id) selected]

data/app/views/layouts/faalis/dashboard.html.erb

@@ -45,7 +45,7 @@
           <%= yield %>
         </section><!-- /.content -->
       </div>
-      <%= render 'faalis/dashboard/shared/footer' %>
+      
       <%= render 'faalis/dashboard/shared/control_sidebar' %>
     </div>
   </body>

data/config/locales/devise.fa.yml

@@ -1,4 +1,11 @@
 fa:
+  activerecord:
+    errors:
+      models:
+        faalis/user:
+          attributes:
+            email:
+              taken: ' قبلا در سیستم ثبت شده است'
   errors:
     messages:
       expired: 'منقضی شده، لطفا درخواست جدید بدهید'

data/config/locales/faalis.fa.yml

@@ -1,15 +1,29 @@
----
 fa:
+  dashboard: 'داشبرد'
+  created_at: 'تاریخ ساخت'
+  updated_at: 'تاریخ ویرایش'
+  password: 'گذرواژه'
+  password_confirmation: 'تکرار گذرواژه'
+  index: 'لیست'
+  edit: 'ویرایش'
+  new: 'جدید'
+  edit_password: 'تغییر گذرواژه'
+  sign_out: 'خروج'
+  users: 'کاربران'
+  groups: 'گروه ها'
   faalis:
+    save: 'ذخیره'
+    cancel: 'انصراف'
+    back: 'بازگشت'
     confirm_password: تکرار گذرواژه
     forgot_your_password: گذرواژه را فراموش کردم
     didnt_receive_confirmation_instructions: "ایمیل اعتبارسنجی را دریافت نکردم"
     didnt_receive_unlock_instructions: "ایمیل فعال سازی را دریافت نکردم"
-
+    back: 'بازگشت'
 
     faalis_version: نسخه فالیس
     copyright_html: |
-      &copy; 2013-2015 <a href="http://yellowen.com">Yellowen</a>.
+      &copy; 2013-2016 <a href="http://yellowen.com">Yellowen</a>.
 
     page_not_found: آدرس پیدا نشد.
     page_not_found_desc: آدرس که دنبال آن می گردید پیدا نشد
@@ -25,9 +39,19 @@ fa:
 
     group:
       group: گروه
+      groups: 'گروه ها'
+      name: 'نام'
+      role: 'نقش'
+      group_name: 'نام گروه'
 
+    users: 'کاربران'
     user:
       user: کاربر
+      first_name: 'نام'
+      last_name: 'نام خانوادگی'
+      email: 'ایمیل'
+      last_signed_in_at: 'آخرین ورود'
+      groups_of_user: 'گروه های کاربر'
 
     member_since: "عضو از %{date}"
     not_authorized: شما مجاز به انجام این فعالیت نیستید.
@@ -38,9 +62,24 @@ fa:
     errors:
       fix_errors: ابتدا این خطاها را رفع کنید
     dashboard:
+      change_password: 'تغییر گذرواژه'
+      actions: 'عملیات'
       index_view:
         new_button: '%{title} جدید'
+      user_message: 'پیام خصوصی'
+      user_messages:
+        inbox: 'صندوق پیام ها'
+        sent: 'ارسال شده ها'
+        draft: 'پیش نویس'
       users: کاربران
+      user:
+      first_name: 'نام'
+      last_name: 'نام خانوادگی'
+      email: 'ایمیل'
+      last_signed_in_at: 'آخرین ورود'
+      groups_of_user: 'گروه های کاربر'
+      user:
+        email: 'ایمیل'
       groups: گروه ها
       user_management: مدیریت کاربران
       dashboard: داشبرد
@@ -63,3 +102,7 @@ fa:
       show: نمایش
       index: لیست
       ownership: مالکیت
+    permission:
+      permissions: 'سطوح دسترسی'
+      entity_name: 'نام بخش'
+      permission: 'سطح دسترسی'

data/db/migrate/20131013091000_devise_create_faalis_users.rb

@@ -1,6 +1,9 @@
 class DeviseCreateFaalisUsers < ActiveRecord::Migration
   def change
-    create_table(:faalis_users) do |t|
+    args = {}
+    args[:id] = :uuid if Faalis::Engine.use_uuid
+
+    create_table(:faalis_users, **args) do |t|
       ## Database authenticatable
       t.string :email,              :null => false, :default => ""
       t.string :encrypted_password, :null => false, :default => ""

data/db/migrate/20131020124701_create_faalis_groups.rb

@@ -1,6 +1,9 @@
 class CreateFaalisGroups < ActiveRecord::Migration
   def change
-    create_table :faalis_groups do |t|
+    args = {}
+    args[:id] = :uuid if Faalis::Engine.use_uuid
+
+    create_table :faalis_groups, **args do |t|
       t.string :name
       t.string :role
 

data/db/migrate/20131021170923_create_faalis_permissions.rb

@@ -1,6 +1,9 @@
 class CreateFaalisPermissions < ActiveRecord::Migration
   def change
-    create_table :faalis_permissions do |t|
+    args = {}
+    args[:id] = :uuid if Faalis::Engine.use_uuid
+
+    create_table :faalis_permissions, **args do |t|
       t.string :model
       t.string :permission_type
 

data/db/migrate/20131123120422_add_permissions_groups_table.rb

@@ -1,8 +1,16 @@
 class AddPermissionsGroupsTable < ActiveRecord::Migration
   def change
-    create_table :faalis_groups_permissions do |t|
-      t.belongs_to :permission
-      t.belongs_to :group
+    args = {}
+    args[:id] = :uuid if Faalis::Engine.use_uuid
+
+    create_table :faalis_groups_permissions, **args do |t|
+      if Faalis::Engine.use_uuid
+        t.uuid :permission_id
+        t.uuid :group_id
+      else
+        t.belongs_to :permission
+        t.belongs_to :group
+      end
     end
   end
 end