faalis 0.7.0 → 0.11.0

data/app/models/faalis/permissions/auth.rb

@@ -0,0 +1,3 @@
+class Faalis::Permissions::Auth
+  include Faalis::Permissions
+end

data/app/models/faalis/user.rb

@@ -19,6 +19,9 @@
 
 module Faalis
   class User < ActiveRecord::Base
+    #acts as messageable for mailboxer
+    acts_as_messageable
+
     validates :password, presence: true, length: {minimum: 5, maximum: 120}, on: :create
     validates :password, length: {minimum: 5, maximum: 120}, on: :update, allow_blank: true
     validates :email, presence: true, length: {minimum: 6}

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

@@ -1,4 +1,6 @@
 <div class="newform">
+<form name="from" novalidate>
+
   <fieldset class="form">
 
   <legend ng-if="!editing"><span translate>New Group</span></legend>
@@ -7,7 +9,7 @@
   <div class="row">
     <div class="small-4 columns">
       <label translate>Name :</label>
-      <input id="id_name" ng-model="new_name" type="text" class="">
+      <input id="id_name" ng-model="new_name" type="text" required>
       <small id="id_name_msg"></small>
     </div>
   </div>
@@ -21,7 +23,7 @@
         <div id="id_permissions" class="small-8 columns field">
           <ul>
 
-              <li ng-repeat="permission in permissions" id="{{permission.name}}" class="" ng-click="select_permission(permission)"> <i ng-show="is_selected(permission)" class="fa fa-check"></i> {{ permission.string }} </li>
+              <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>
@@ -34,8 +36,10 @@
 
   <div class="row">
       <div class="small-6 columns">
-        <button class="btn small green" ng-click="save()"><i class="fa fa-check"></i> <span translate>Save</span></button>
+        <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>

data/app/views/angularjs_templates/auth/users/details.html

@@ -15,7 +15,7 @@
 </p>
 
 <ul class="button-group float-right">
-    <a href="#/auth/users/{{this.object.id}}/edit" class="small">
+    <a href="#/auth/users/{{this.object.id}}/reply" class="small">
     <span class="fa fa-edit"></span> <span translated>Edit</span>
     </a>
     <a href="" class="small">

data/app/views/angularjs_templates/auth/users/new.html

@@ -1,4 +1,5 @@
 <div class="newform">
+  <form novalidate name="form">
   <fieldset class="form">
 
     <legend translate>New User</legend>
@@ -6,7 +7,7 @@
     <div class="row">
       <div class="small-4 columns">
         <label for="first_name" translate>First Name :</label>
-        <input  id="id_first_name" type="text" name="first_name"  required ng-model="first_name" required>
+        <input  id="id_first_name" type="text" name="first_name"  required ng-model="first_name">
         <small id="id_first_name_msg"></small>
       </div>
 
@@ -48,9 +49,9 @@
 
   <div class="row">
     <div class="small-4 columns">
-      <button ng-click="save()" class="btn small green" ng-disabled="form.first_name.$pristine || form.first_name.$dirty && form.fist_name.$invalid"><i class="fa fa-check"></i> <span translate>Save</span></button>
+      <button ng-click="save()" class="btn small green" ng-disabled="form.$invalid || !form.$dirty"><i class="fa fa-check"></i> <span translate>Save</span></button>
       <button ng-click="cancel()" class="btn small red"><i class="fa fa-times"></i> <span translate>Cancel</span></button>
     </div>
   </div>
-
+</form>
 </div>

data/app/views/angularjs_templates/conversations/details.html

@@ -0,0 +1,18 @@
+<div class="details">
+  <p>
+    <b translate>Sent at : </b>{{this.object.created_at}} &nbsp;&nbsp;&nbsp; <b translate>Last Update : </b>{{this.object.updated_at}}
+  </p>
+
+  <ul class="button-group float-right">
+    <a class="small" href="#/conversations/{{this.object.id}}/show">
+      <span class="fa fa-eye"></span> <span translated>Read </span>
+    </a>
+    <a class="small" href="#/conversations/{{this.object.id}}/reply">
+      <span class="fa fa-edit"></span> <span translated>Reply</span>
+    </a>
+    <a class="small" ng-click="this.on_trash(this.object)">
+      <span class="fa fa-edit"></span> <span translated>Trash</span>
+    </a>
+</a>
+</ul>
+</div>

data/app/views/angularjs_templates/conversations/index.html

@@ -0,0 +1,6 @@
+<list-view buttons="buttons" objects="conversations" title-attribute="'subject'" details-template="details_template" item-per-page="10" on_delete="on_trash">
+
+  <div class="small-6 column text-left clearpadding">
+    <h3><i class="fa fa-group"></i> <span translate>Conversations</span></h3>
+  </div>
+</list-view>

data/app/views/angularjs_templates/conversations/new.html

@@ -0,0 +1,39 @@
+<div class="newform">
+  <form novalidate name="form">
+  <fieldset class="form">
+
+    <legend translate>New User</legend>
+
+    <div class="row">
+      <div class="small-4 columns">
+        <label for="recipients" translate> Recipient(s):</label>
+        <input  id="id_recipients" type="text" name="recipients"  required ng-model="recipients">
+        <small id="id_recipients_msg"></small>
+      </div>
+      </div>
+    <div class="row">
+
+      <div class="small-4 columns float-left">
+        <label for="subject" translate>subject :</label>
+        <input  id="id_subject" type="text" name="subject"  required ng-model="subject">
+        <small id="id_subject_msg"></small>
+      </div>
+    </div>
+    <div class="row">
+      <div class="small-8 columns float-left ">
+        <label for="body" translate>Message :</label>
+        <textarea id="id_body" name="body" required ng-model="body"></textarea>
+        <small id="id_body_msg"></small>
+      </div>
+    </div>
+
+  </fieldset>
+
+  <div class="row">
+    <div class="small-4 columns">
+      <button ng-click="save()" class="btn small green" ng-disabled="form.$invalid || !form.$dirty"><i class="fa fa-check"></i> <span translate>Send</span></button>
+      <button ng-click="cancel()" class="btn small red"><i class="fa fa-times"></i> <span translate>Cancel</span></button>
+    </div>
+  </div>
+</form>
+</div>

data/app/views/angularjs_templates/conversations/show.html

@@ -0,0 +1,6 @@
+<list-view buttons="buttons" objects="conversations" title-attribute="message_title" details-template="details_template" item-per-page="10" on_delete="on_trash">
+
+  <div class="small-6 column text-left clearpadding">
+    <h3><i class="fa fa-group"></i> <span translate>Conversations</span></h3>
+  </div>
+</list-view>

data/app/views/angularjs_templates/conversations/show_details.html

@@ -0,0 +1,18 @@
+<div class="details">
+  <p>
+    <b translate>Sent at : </b>{{this.object.message.created_at}} &nbsp;&nbsp;&nbsp; <b translate>Last Update : </b>{{this.object.message.updateded_at}}
+    {{this.object.message.updated_at}}
+  </p>
+  <p>
+    {{this.object.message.body}}
+  </p>
+  <ul class="button-group float-right">
+    <a class="small" href="#/conversations//reply">
+      <span class="fa fa-edit"></span> <span translated>Reply</span>
+    </a>
+    <a class="small" ng-click="this.on_trash(this.object)">
+      <span class="fa fa-edit"></span> <span translated>Trash</span>
+    </a>
+</a>
+</ul>
+</div>

data/app/views/angularjs_templates/fields/boolean/boolean.html

@@ -0,0 +1,4 @@
+<div>
+  <input id="{{ element_id }}" ng-model="model" name="{{ field }}" ng-required="required" type="checkbox" class="{{cssClasses}}" />
+  <small id="{{ msg_element_id }}"></small>
+</div>

data/app/views/angularjs_templates/fields/datetime/datetime.html

@@ -0,0 +1,4 @@
+<div>
+  <datepicker  id="{{ element_id }}" ng-model="model" class="{{cssClasses}}" ng-required="required" name="{{ field }}" placeholder="{{ 'Click to pick a date' | translate }}" />
+  <small id="{{ msg_element_id }}"></small>
+</div>

data/app/views/angularjs_templates/fields/integer/integer.html

@@ -0,0 +1,4 @@
+<div>
+  <input id="{{ element_id }}" ng-model="model" name="{{ field }}" ng-required="required" type="text" class="{{cssClasses}}" />
+  <small id="{{ msg_element_id }}"></small>
+</div>

data/app/views/angularjs_templates/fields/relation/relation.html

@@ -0,0 +1,28 @@
+<div>
+  <select ui-select2="select2Options" id="{{ element_id }}" ng-model="model" name="{{ field.name }}" ng-required="required" ng-if="field.type === 'belongs_to'">
+    <option ng-repeat="item in all_options" value="{{ item.id }}" title="{{ item[titleField] || item }}" ng-selected="item.id === model.id">{{ item[titleField] || item }}</option>
+  </select>
+
+  <select ui-select2="select2Options" id="{{ element_id }}" ng-model="model" name="{{ field.name }}" ng-required="required" multiple ng-if="field.type === 'has_many'">
+    <option ng-repeat="item in all_options" value="{{ item.id }}" title="{{ item[titleField] || item }}" ng-selected="have(item.id)">{{ item[titleField] || item }}</option>
+  </select>
+
+  <select ui-select2="select2Options" id="{{ element_id }}" ng-model="model" name="{{ field.name }}" ng-required="required" ng-if="field.type === 'in'">
+    <option ng-repeat="item in field.choices" value="{{ item.name }}" title="{{ item.title }}" ng-selected="model === item.name">{{ item.title }}</option>
+  </select>
+
+  <!-- Add and Refresh buttons -->
+  <div class="float-right relation_links" ng-if="(field.type === 'belongs_to') || (field.type === 'has_many')">
+    <span>
+      <a ng-href="#{{ field.to }}/new" target="_blank">
+        <i class="fa fa-plus"></i>
+      </a>
+    </span>
+    <span ng-click="update_collection()">
+      <i class="fa fa-refresh"></i>
+    </span>
+  </div>
+
+  <small id="{{ msg_element_id }}"></small>
+  <!-- --------------------------------- -->
+</div>

data/app/views/angularjs_templates/fields/string/string.html

@@ -0,0 +1,4 @@
+<div>
+  <input id="{{ element_id }}" ng-model="model" name="{{ field }}" ng-required="required" type="text" class="{{cssClasses}}" />
+  <small id="{{ msg_element_id }}"></small>
+</div>

data/app/views/angularjs_templates/fields/text/text.html

@@ -0,0 +1,4 @@
+<div>
+  <textarea id="{{ element_id }}" ng-model="model" name="{{ field }}" ng-required="required" class="{{cssClasses}}"></textarea>
+  <small id="{{ msg_element_id }}"></small>
+</div>

data/app/views/angularjs_templates/list-view/index.html

@@ -28,7 +28,7 @@
       <i ng-click="toggle_details(object)"  class="{{ handle_icon }} {{ handle_icon_expand(object) }} handle fa "></i>
 
       <div class="title" ng-click="select_item(object)">
-        {{ object[title_attr] }}
+        {{ title(object, title_attr) }}
       </div>
 
       <div ng-show="should_view(object)" class="details">

data/app/views/angularjs_templates/modules.html

@@ -2,7 +2,7 @@
 
   <li ng-click="controller.on_click('/')"><p><i class="fa fa-dashboard"></i> <span translate>Dashboard</span></p></li>
 
-  <li data-ng-repeat="module in controller.modules">
+  <li data-ng-repeat="module in controller.modules" if-user="user.can('read', module.model)">
     <p ng-click="controller.view_menu(module)"><i class="{{ module.icon }}"></i> <span translate>{{ module.title }}</span></p>
     <ul class="submenu slide"  ng-if="module.show_menu">
         <li ng-repeat="menu_item in module.menu_items" ng-click="controller.on_click(menu_item.url)"><span>{{ menu_item.title }}</span></li>
@@ -12,6 +12,6 @@
 </ul>
 
 <div class="brand">
-  <h1 translate>Site_Title</h1>
+  <h1 translate><%= Faalis::Engine.site_title %></h1>
   <span translate>Some_Slug</span>
 </div>

data/app/views/faalis/api/v1/conversations/create.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @conversation

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

@@ -0,0 +1 @@
+json.array! @mailbox

data/app/views/faalis/api/v1/conversations/show.json.jbuilder

@@ -0,0 +1,10 @@
+json.extract! @conversations, :id, :subject, :created_at, :updated_at
+
+  json.messages @conversations.messages do |m|
+    json.subject m.subject
+    json.body m.body
+  end
+
+  json.recipients @conversations.recipients do |m|
+    json.email m.email
+  end

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

@@ -0,0 +1 @@
+json.permissions @permissions

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

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="<%= ::I18n.locale %>" dir="<%= Faalis::I18n.direction(I18n.locale) %>" ng-app="Dashboard">
+<html lang="<%= ::I18n.locale %>" dir="<%= Faalis::I18n.direction(I18n.locale) %>">
 <head>
   <title><%= Faalis::Engine.site_title %></title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />

data/config/routes.rb

@@ -25,12 +25,23 @@ Faalis::Engine.routes.draw do
   namespace :api, :defaults => {:format => :json} do
     namespace :v1 do
       get "permissions", :to => "permissions#index"
+      get "permissions/user", :to => "permissions#user_permissions"
       resources :groups, :except => [:new]
       resources :users, :except => [:new]
       resource :profile, :except => [:new, :destroy]
       get "logs" => "logs#index"
+
+      resources :conversations, only: [:index, :show, :create] do
+        collection do
+          get ":box/box" => "conversations#index"
+        end
+        member do
+          post :reply
+          post :trash
+          post :untrash
+        end
+
+      end
     end
   end
-
-
 end

data/db/seeds.rb

@@ -1,5 +1,7 @@
 # Database initial data
 
+ModelDiscovery::Engine.load_seed
+
 Faalis::Group.create({:name => "Admin"})
 Faalis::Group.create({:name => "Guest", :id => 2})
 

data/lib/faalis.rb

@@ -23,6 +23,7 @@ module Faalis
 end
 
 require "faalis/engine"
+require "faalis/permissions"
 require "faalis/dashboard"
 require "faalis/omniauth"
 require "faalis/active_record"

data/lib/faalis/active_record.rb

@@ -4,61 +4,6 @@
 
 module ActiveRecord
   class Base
-    class Permissions
-
-      # Default permission hash
-      @@permissions = {
-        :read => nil,
-        :update => nil,
-        :create => nil,
-        :destory => nil,
-      }
-
-      @@only_owner = false
-
-      # @return an array of strings representation of permissions
-      def self.permission_strings(model)
-        strings = []
-        @@permissions.each do |key, value|
-          strings << {
-            :name => "#{key}|#{model.model_name}",
-            :string => _("can %s %s") % [_(key.to_s), model.model_name.human]
-          }
-
-        end
-        strings
-      end
-
-      # Define permissions using this method
-      def self.permissions(*args)
-
-        args.each do |permission|
-          if permission.class == Symbol
-            if not @@permissions.include? permission
-              @@permission[permission] = nil
-
-            elsif permission.class == Hash
-
-              permission.each do |key, value|
-                @@permissions[key.to_sym] = value
-              end
-
-            end
-          end
-
-
-        end
-      end
-
-      # This force user to have access to resources which is his.
-      def self.only_his_objects
-        @@only_owner = true
-      end
-
-      def self.only_his_objects?
-        @@only_owner
-      end
-
-    end
+    include Faalis::Permissions
   end
 end

data/lib/faalis/engine.rb

@@ -24,6 +24,7 @@ require "font-awesome-rails"
 require "devise"
 require "warden"
 require "cancan"
+require "mailboxer"
 
 
 module Faalis

data/lib/faalis/permissions.rb

@@ -0,0 +1,65 @@
+module Faalis
+  module Permissions
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      # Default permission hash
+      @@permissions = {
+        :read => nil,
+        :update => nil,
+        :create => nil,
+        :destory => nil,
+      }
+
+      @@only_owner = false
+
+      # @return an array of strings representation of permissions
+      def permission_strings(model)
+        strings = []
+        @@permissions.each do |key, value|
+          strings << {
+            :name => "#{key}|#{model.model_name}",
+            :string => _("can %s %s") % [_(key.to_s), model.model_name.human]
+          }
+        end
+        strings
+      end
+
+      def possible_permissions
+        @@permissions.keys
+      end
+
+      # Define permissions using this method
+      def permissions(*args)
+
+        args.each do |permission|
+          if permission.class == Symbol
+            if not @@permissions.include? permission
+              @@permission[permission] = nil
+
+            elsif permission.class == Hash
+
+              permission.each do |key, value|
+                @@permissions[key.to_sym] = value
+              end
+
+            end
+          end
+
+
+        end
+      end
+
+      # This force user to have access to resources which is his.
+      def only_his_objects
+        @@only_owner = true
+      end
+
+      def only_his_objects?
+        @@only_owner
+      end
+
+    end
+  end
+
+end