faalis 0.24.4 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21454872bc3b4a3814a722386575c01050009a44
-  data.tar.gz: 9f097e17886a2904a668f50381c56ca7108e1204
+  metadata.gz: 57235f4273f0784e21d8a157f8dd9f11b0209f83
+  data.tar.gz: a232ef417944fe7e7573d36cb9c554a510146762
 SHA512:
-  metadata.gz: 7d15b03eb94e2b704912fa3f0bd55ab1787923b21ee3f56965513bf175ac39e5a3df49d4e28089d2818b78744da953b72ac6f2f1a20636c2a1480315c49e237b
-  data.tar.gz: acbc8c7e18be3d751f8a440ac25d62094da51d3428854e460f0cced823329834def06d698b26c8e3b35cddb64148773e7d23c2654cac1b282aa871f0bf1a8b22
+  metadata.gz: a5593499cdf0803d93dfe23ea248856ad355d0b05833c31708ec4c81fcbd9914a3d92e80b6c44ada4c32f30bea3eacf3240f10bfb829bae8f6c7a773a6c68802
+  data.tar.gz: a6500a1f72c9fcca90f7936d148c6ea0bb1bdea0c31ab8a7548014297788cac1803438a2d89145d23cf9cc613940c662c374be6266e2f8585b5a35822e789d92

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

@@ -64,6 +64,7 @@ Group.controller("AddGroupController", ["Restangular", "$scope", "$location", "$
     $scope.permissions = [];
     $scope.editing = false;
 
+
     $scope.$on("update_perms", function(event) {
         var sel_perms = [];
         event.targetScope.selected_perms.forEach(function(perm){
@@ -93,8 +94,13 @@ Group.controller("AddGroupController", ["Restangular", "$scope", "$location", "$
                 .catch(catch_error);
     }
 
+    API.all('workflows').getList()
+            .then(function(data){
+                $scope.workflows = data;
+            })
+            .catch(catch_error);
 
-    var permissions = API.all('permissions').getList()
+    API.all('permissions').getList()
             .then(function(data){
                 $scope.permissions = data;
                 $scope.$emit("update_perms");

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

@@ -8,6 +8,7 @@ Relation.directive('relationField', ["$filter", "gettext", "Restangular", "catch
 
     function link(scope, element, attrs){
         var ltr = is_ltr();
+
         scope.element_id = "id_" + scope.field.name;
         scope.msg_element_id = "id_" + scope.field.name + "_msg";
         scope.show_help_btn = false;
@@ -34,9 +35,27 @@ Relation.directive('relationField', ["$filter", "gettext", "Restangular", "catch
                     return false;
                 }
             };
+            scope.show_buttons = function() {
+                if ("hide_buttons" in scope.field) {
+                    return !scope.field.hide_buttons;
+                }
+                return true;
+            };
 
-            scope.update_collection = function(){
-                var list_object = API.all(scope.field.to);
+            // Update current field collection list by execute a query on remote end.
+            // if `force` param had non undefined value this method will skip `parent_id`
+            // check
+            scope.update_collection = function(force){
+                if ("parent_id" in scope.field) {
+                    if ((scope.field.parent_id === undefined) && (force === undefined)) {
+                        return;
+                    }
+                }
+                var to = scope.field.to;
+                if (typeof(scope.field.to) === "function") {
+                    to = scope.field.to();
+                }
+                var list_object = API.all(to);
                 if ("list_object" in scope.options) {
                     list_object = scope.options.list_object;
                 }
@@ -52,7 +71,17 @@ Relation.directive('relationField', ["$filter", "gettext", "Restangular", "catch
 
             scope.update_collection();
         }
-
+        else {
+            // Add support for `multiple` key in fields with `in` type
+            scope.multiple = function(){
+                if ("multiple" in scope.field) {
+                    if (scope.field.multiple !== undefined) {
+                        return scope.field.multiple;
+                    }
+                }
+                return false;
+            };
+        }
         // Populate model with new data
         function update_model_data(){
             var new_val = $("#" + scope.element_id).val();
@@ -75,6 +104,20 @@ Relation.directive('relationField', ["$filter", "gettext", "Restangular", "catch
             }
         };
         update_model_data();
+
+        // User can provide a variable to watch on. In case of
+        // any change below function will run. for example:
+        // suppose your select box should update by using value
+        // of other fields. you can add `update-on-change="OtherVar"
+        // to your relation-field.
+        // Remember that in that case you should specify a function
+        // for `to` field of `field-data` which should return a url
+        // of destination resource.
+        scope.$watch('update_on_change', function(newv) {
+            if (newv !== undefined) {
+                scope.update_collection(true);
+            }
+        });
     }
     // Actual object of <relation-field> directive
     return {
@@ -108,6 +151,10 @@ Relation.directive('relationField', ["$filter", "gettext", "Restangular", "catch
             // relation field data
             field: '=fieldData',
 
+            // A variable to watch. in case of change current field
+            // collection will update.
+            update_on_change: '=updateOnChange',
+
             // Actual Angularjs ng-model
             model: '='
         },

data/app/assets/stylesheets/faalis/base.css.scss

@@ -49,7 +49,14 @@ footer {
    min-height:60px;
    position:relative;
    margin: 0 auto;
-   color:$lightgray;
+   color: $lightgray;
+
+   &.plain {
+      background: none;
+      div {
+         padding: 5px;
+      }
+   }
 
    div{
       padding:20px 60px;
@@ -316,3 +323,11 @@ small.error {
   font-size: 0.6em;
   color: $lightgray;
 }
+
+.single-form {
+   padding-top: 5em;
+   min-height: 35em;
+   fieldset {
+      height: 20em;
+   }
+}

data/app/assets/stylesheets/faalis/ltr/foundation_and_overrides.scss

@@ -1,3 +1,5 @@
+@import "faalis/variables";
+
 // Foundation by ZURB
 // foundation.zurb.com
 // Licensed under MIT Open Source
@@ -1250,5 +1252,7 @@ $section-title-bg: #f5f5f5;
 $section-border-color: #dfdfdf;
 $topbar-margin-bottom: 0;
 $topbar-breakpoint: emCalc(768px); // Change to 9999px for always mobile layout
+$topbar-bg: $headerbg;
+$topbar-dropdown-toggle-alpha: 0.4;
 
 @import 'foundation';

data/app/assets/stylesheets/faalis/rtl/foundation_and_overrides.css.scss

@@ -1255,7 +1255,7 @@ $alert-close-position: emCalc(12px);
 $section-function-factor: 5%;
 $section-title-bg: #f5f5f5;
 $section-border-color: #dfdfdf;
-$topbar-bg: $dashboard-nav-background;
+$topbar-bg: $headerbg;
 $topbar-margin-bottom: emCalc(20px);
 $topbar-input-height: emCalc(60px);
 $topbar-transition-speed: 300ms;

data/app/assets/stylesheets/faalis/variables.css.scss

@@ -7,7 +7,7 @@ $base_unit: 150px;
 $wet_asphalt: #34495E;
 $midnight_blue: #2C3E50;
 
-$headerbg: #111111;
+$headerbg: #4f4f4f;
 $darkbg: #202224;
 
 $clouds: #ecf0f1;

data/app/controllers/faalis/#api_controller.rb#

@@ -0,0 +1,144 @@
+# -----------------------------------------------------------------------------
+#    Faalis - Basic website skel engine
+#    Copyright (C) 2012-2013 Yellowen
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License along
+#    with this program; if not, write to the Free Software Foundation, Inc.,
+#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# -----------------------------------------------------------------------------
+require_dependency "faalis/api_controller"
+
+
+# This class is the base class of all API controllers in any **Faalis**
+# host applications. Each host Rails application should have an `APIController`
+# which inherit from this class.
+class Faalis::APIController < Faalis::ApplicationController
+
+  @@allowed_fields = []
+
+  # Only support `json` format
+  respond_to :json
+
+  # Authenticate user before any action take place
+  before_filter :authenticate_filter
+
+  # Check for any presence of filtering query, In querystring and load
+  # resource using them
+  before_filter :load_resource_by_query, :only => [:index]
+
+
+  protect_from_forgery
+
+  # Set csrf cookie after any action
+  after_filter :set_csrf_cookie_for_ng
+
+  # Rescue from any access denied exception raised from cancan and
+  # returns a useful error message in json
+  rescue_from CanCan::AccessDenied do |exception|
+
+    render :status => 403, :json => {
+      :error => _("You don't have access to this page"),
+      :orig_msg => exception.message,
+      :action => exception.action,
+    }
+  end
+
+  def set_csrf_cookie_for_ng
+    cookies['XSRF-TOKEN'] = form_authenticity_token if protect_against_forgery?
+  end
+
+  # User authentication for API services take place here. By default
+  # **Faalis** uses the authentication method of **Devise** to authenticate
+  # access to API service.
+  #
+  # If you want to change authentication method ? just override this method
+  # in you **APIController**
+  def authenticate_filter
+    authenticate_user!
+  end
+
+  # Load resource by using parameters specified in querystring.
+  def load_resource_by_query
+    # If any query string parameter provided and allow fields specified
+    if not request.query_parameters.empty? and not allowed_fields.empty?
+
+      logger.info ("Load resource by query parameters")
+      # Iterate over parameters in query string
+      request.query_parameters.each do |key, value|
+        # each key can be like filename[__querytype]=value
+        # which `querytype` is string that specify the query type scope
+        # to use in model. For example these is a query type scope called
+        # `gt` which mean the mentioned field should be greater than the
+        # value
+        field, query_type = key.split("__")
+
+        if allowed_fields.include? field
+          # If field name is in the allowed list
+          # If no query type specified we will use assignment scope.
+          if query_type.nil?
+            query_type = "assignment"
+          end
+
+          # If model have an scope with the "#{query_type}_query" name.
+          # Otherwise skip
+          if model_class.respond_to? "#{query_type}_query"
+
+            # If resource already loaded. If there was a instnace variable
+            # with the plural name of the resource exists then resource
+            # already loaded and we should chain new conditions
+            if instance_variable_defined? "@#{controller_name}"
+              instance_variable_get("@#{controller_name}").send("#{query_type}_query".to_sym, field, value)
+            else
+              # Resource did not loaded we make first query
+              # (without touching database) and set the corresponding
+              # instance variables
+              relation_object = model_class.send("#{query_type}_query".to_sym, field, value)
+              instance_variable_set("@#{controller_name}", relation_object)
+            end
+
+          else
+            logger.info "There is no `#{query_type}_query` in `#{model_class.to_s}` model."
+          end
+        else
+          logger.warn "`#{field}` in not in allowed list for `#{self.class.to_s}`."
+        end
+      end
+    else
+      logger.info("Load resource using `load_resource`")
+      #self.class.load_resource
+    end
+  end
+
+  # An array of allowed fields for query loading
+  def allowed_fields
+    @@allowed_fields
+  end
+
+  # Using this query you can activate the query loading system
+  # and specify fields which you want to use in query loading
+  def self.allow_query_on(*args)
+    @@allowed_fields = args.to_a.collect { |x| x.to_s }
+  end
+
+  protected
+
+  # Model class related to this controller.
+  def model_class
+    controller_name.singularize.classify.constantize
+  end
+
+  def verified_request?
+    super || form_authenticity_token == request.headers['X-XSRF-TOKEN']
+  end
+
+end

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

@@ -0,0 +1,120 @@
+require_dependency 'faalis/application_controller'
+
+module Faalis
+  class API::V1::ConversationsController < ::APIController
+    before_filter :authenticate_user!
+    helper_method :mailbox, :conversation
+
+    def create
+      #binding.pry
+      recipient_emails = message_params(:recipients).split(',')
+      recipients = User.where(email: recipient_emails).all
+
+      @conversation = current_user.
+        send_message(recipients, *message_params(:body, :subject)).conversation
+
+      respond_with(@conversation)
+    end
+
+    def reply
+      @conversation = current_user.reply_to_conversation(conversation, *message_params(:body, :subject))
+      respond_with(@conversation)
+    end
+
+    def trash
+      ids = params[:id].split(",")
+      ids.each do |id|
+        conversation = current_user.mailbox.conversations.find(params[:id])
+        conversation.move_to_trash(current_user)
+      end
+    end
+
+    def untrash
+      ids = params[:id].split(",")
+      ids.each do |id|
+        conversation = current_user.mailbox.conversations.find(params[:id])
+        conversation.untrash(current_user)
+      end
+
+    end
+
+    def destroy
+      ids = params[:id].split(",")
+      ids.each do |id|
+        conversation = current_user.mailbox.conversations.find(params[:id])
+        current_user.mark_as_deleted conversation
+        #conversation.mark_as_deleted(current_user)
+      end
+      respond_with
+    end
+
+    def index
+      if params[:box] == "inbox"
+        box = "inbox"
+      elsif params[:box] == "sentbox"
+        box = "sentbox"
+      elsif params[:box] == "trash"
+        box = "trash"
+      else
+        respond_to do |f|
+          f.any { head :not_found }
+        end
+        returng
+      end
+      # puts current_user.mailbox.sent.to_json
+      @mailbox ||= current_user.mailbox.send(box.to_sym)
+      respond_with @mailbox
+    end
+
+
+    def show
+      #def conversation
+      @conversations ||= current_user.mailbox.conversations.find(params[:id])
+      @current_user = current_user
+      #      @conversation = {}
+      #      conversations.each do |conversation|
+      #        tmp = {
+      #          :receipts => conversation.receipts,
+      #          :body => conversation.messages.body,
+      #          :is_read => conversation.is_read,
+      #          :trashed => conversation.trashed,
+      #          :deleted => conversation.deleted,
+      #          :recipients => conversation.recipients
+      #        }
+      #unless @conversation.include? conversation.id
+      #  @conversation[conversation.id] = tmp
+      #end
+      #end
+
+    end
+    private
+
+    def mailbox
+      @mailbox ||= current_user.mailbox
+    end
+
+
+    def conversation
+      @conversation ||= mailbox.conversations.find(params[:id])
+    end
+
+    def conversation_params(*keys)
+      fetch_params(:conversation, *keys)
+    end
+
+    def message_params(*keys)
+      fetch_params(:message, *keys)
+    end
+
+    def fetch_params(key, *subkeys)
+      params[key].instance_eval do
+        case subkeys.size
+        when 0 then self
+        when 1 then
+          self[subkeys.first]
+        else subkeys.map{|k| self[k] }
+        end
+      end
+    end
+  end
+end