erp_app 3.0.7 → 3.0.8

data/README.md

@@ -1,3 +1,26 @@
 #ErpApp
 
 Provides an application infrastructure based on the Sencha/extjs UI framework, as well as several utilities and example applications. It houses the core application container framework and component model infrastructure that play a key role in the RAD/Agile orientation of CompassAE.
+
+##Initializer Options
+
+- widgets
+  - This should be let as an empty array.  CompassAE will add any available widgets if finds.
+  - Default : []
+- session_warn_after
+  - This is the time in minutes when the user will be warned that thier session is about to expire due to inactivity.
+  - Default : 18
+- session_redirect_after
+  - This is the time in minutes a user will be redirected to the login screen. It should be set to mimic your Rails configuration
+  - Default : 20
+
+### Override Initializer
+
+To override these settings simple create a erp_app.rb file in your initializers and override the config options you want
+
+    Rails.application.config.erp_app.configure do |config|
+      config.widgets = []
+      config.session_warn_after = 18 #in minutes
+      config.session_redirect_after = 20 #in minutes
+    end
+    Rails.application.config.erp_app.configure!

data/app/controllers/erp_app/application_controller.rb

@@ -3,6 +3,7 @@ module ErpApp
     protect_from_forgery
 
     protected
+
     def not_authenticated
       redirect_to '/erp_app/login', :notice => "Please login first."
     end

data/app/controllers/erp_app/desktop/file_manager/base_controller.rb

@@ -46,11 +46,20 @@ module ErpApp
         end
 
         def save_move
-          path            = params[:node]
-          new_parent_path = (params[:parent_node] == ROOT_NODE) ? base_path : params[:parent_node]
-          result, message = @file_support.save_move(path, new_parent_path)
-
-          render :json => {:success => result, :msg => message}
+          messages = []
+          nodes_to_move = (params[:selected_nodes] ? JSON(params[:selected_nodes]) : [params[:node]])
+
+          begin
+            nodes_to_move.each do |node|
+              path            = node
+              new_parent_path = (params[:parent_node] == ROOT_NODE) ? base_path : params[:parent_node]
+              result, message = @file_support.save_move(path, new_parent_path)
+              messages << message
+            end
+            render :json => {:success => true, :error => messages.join(',')}
+          rescue Exception => e
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def rename_file
@@ -63,11 +72,18 @@ module ErpApp
         end
 
         def delete_file
-          path = params[:node]
-
-          result, message = @file_support.delete_file(path)
-
-          render :json => {:success => result, :msg => message}
+          messages = []
+          nodes_to_delete = (params[:selected_nodes] ? JSON(params[:selected_nodes]) : [params[:node]])
+
+          begin
+            nodes_to_delete.each do |path|
+              result, message = @file_support.delete_file(path)
+              messages << message
+            end
+            render :json => {:success => true, :error => messages.join(',')}
+          rescue Exception => e
+            render :json => {:success => false, :message => ex.message}
+          end
         end
 
         def expand_directory
@@ -89,12 +105,7 @@ module ErpApp
         end
 
         def upload_file
-          if request.env['HTTP_EXTRAPOSTDATA_DIRECTORY'].blank?
-            upload_path = params[:directory]
-          else
-            upload_path = request.env['HTTP_EXTRAPOSTDATA_DIRECTORY']
-          end
-
+          upload_path = params[:directory]
           upload_path = base_path if upload_path == ROOT_NODE
 
           result = upload_file_to_path(upload_path)
@@ -107,14 +118,13 @@ module ErpApp
         def upload_file_to_path(upload_path, valid_file_type_regex=nil)
           result = {}
 
-          unless File.directory? upload_path
-            FileUtils.mkdir_p(upload_path)
-          end
+          FileUtils.mkdir_p(upload_path) unless File.directory? upload_path
+
+          upload_path = params[:directory]
+          name = params[:name]
+          contents = request.raw_post
 
-          upload_path = request.env['HTTP_X_DIRECTORY'].blank? ? params[:directory] : request.env['HTTP_X_DIRECTORY']
-          name = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data].original_filename : request.env['HTTP_X_FILE_NAME']
-          contents = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data].read : request.raw_post
-          Rails.logger.info contents
+          #Rails.logger.info contents
           if !valid_file_type_regex.nil? && name !=~ valid_file_type_regex
             result[:success] = false
             result[:error]   = "Invalid file type"

data/app/controllers/erp_app/public_controller.rb

@@ -14,7 +14,6 @@ module ErpApp
 	  # end
 
     # TODO:
-    # test X Send file in apache
     # reorder menuitems
     # drag and drop image into ckeditor uses bad (but somehow not broken, i.e. ../../images/) url (filesystem on firefox, chrome OK) 
 
@@ -56,10 +55,10 @@ module ErpApp
     def serve_file(file, disposition=nil)
       type = (file.type == 'Image' ? "image/#{params[:format]}" : file.content_type)
 
-      if Rails.application.config.erp_tech_svcs.file_storage == :s3
+      if ErpTechSvcs::Config.file_storage == :s3
         path = File.join(file.directory,file.name).sub(%r{^/},'')
         options = { :response_content_disposition => disposition }
-        options[:expires] = Rails.application.config.erp_tech_svcs.s3_url_expires_in_seconds if file.has_capabilities?
+        options[:expires] = ErpTechSvcs::Config.s3_url_expires_in_seconds if file.has_capabilities?
         redirect_to @file_support.bucket.objects[path].url_for(:read, options).to_s
       else
         # to use X-Sendfile or X-Accel-Redirect, set config.action_dispatch.x_sendfile_header in environment config file

data/app/controllers/erp_app/shared/configuration_controller.rb

@@ -1,6 +1,7 @@
 module ErpApp
 	module Shared
 		class ConfigurationController < ErpApp::ApplicationController
+      before_filter :require_login
 
       def setup_categories
         configuration = ::Configuration.find(params[:id])

data/app/controllers/erp_app/shared/notes_controller.rb

@@ -1,6 +1,7 @@
 module ErpApp
 	module Shared
 		class Shared::NotesController < ErpApp::ApplicationController
+      before_filter :require_login
 
 		  def view
         if params[:party_id].to_i == 0

data/app/controllers/erp_app/shared/profile_management_controller.rb

@@ -0,0 +1,22 @@
+module ErpApp
+  module Shared
+    class ProfileManagementController < ErpApp::ApplicationController
+      before_filter :require_login
+
+      def update_email
+        current_user.email = params[:email]
+        if current_user.save
+          message = "<ul>"
+          current_user.errors.collect do |e, m|
+            message << "<li>#{e} #{m}</li>"
+          end
+          message << "</ul>"
+          render :json => {:success => true, :message => message}
+        else
+          render :json => {:success => true, :message => 'Error updating email'}
+        end
+      end
+
+    end #ProfileManagementController
+  end #Desktop
+end #ErpApp

data/app/controllers/erp_app/widget_proxy_controller.rb

@@ -2,6 +2,7 @@ module ErpApp
 	class WidgetProxyController < ErpApp::ApplicationController
 	  
     attr_accessor :performed_redirect
+    before_filter :set_website
 
 	  def index
 		  @widget_name   = params[:widget_name]
@@ -16,7 +17,7 @@ module ErpApp
 
       result = widget_obj.process(@widget_action)
       result.nil? ? return : (render result)
-		end
+    end
     
 	end
 end

data/app/models/configuration.rb

@@ -31,6 +31,9 @@ class Configuration < ActiveRecord::Base
   end
 
   def add_configuration_item(configuration_item_type, *option_internal_identifiers)
+    option_internal_identifiers = option_internal_identifiers.collect{|item| item.to_s}
+    configuration_item_type = (configuration_item_type.is_a? ConfigurationItemType) ? configuration_item_type : ConfigurationItemType.find_by_internal_identifier(configuration_item_type.to_s)
+
     item = get_configuration_item(configuration_item_type)
     if item
       update_configuration_item(configuration_item_type, option_internal_identifiers)
@@ -49,6 +52,8 @@ class Configuration < ActiveRecord::Base
   alias :add_item :add_configuration_item
 
   def update_configuration_item(configuration_item_type, *option_internal_identifiers)
+    configuration_item_type = (configuration_item_type.is_a? ConfigurationItemType) ? configuration_item_type : ConfigurationItemType.find_by_internal_identifier(configuration_item_type.to_s)
+    
     item = self.items.where('configuration_item_type_id = ?', configuration_item_type.id).first
     raise "Configuration item #{configuration_item_type.description} does not exist for configuration #{self.description}" if item.nil?
 
@@ -59,6 +64,8 @@ class Configuration < ActiveRecord::Base
   alias :update_item :update_configuration_item
 
   def get_configuration_item(configuration_item_type)
+    configuration_item_type = (configuration_item_type.is_a? ConfigurationItemType) ? configuration_item_type : ConfigurationItemType.find_by_internal_identifier(configuration_item_type.to_s)
+    
     self.items.where('configuration_item_type_id = ?', configuration_item_type.id).first
   end
 

data/app/views/erp_app/desktop/base/index.erb

@@ -68,7 +68,6 @@
       "erp_app/desktop/applications/control_panel/module.js",
       "erp_app/desktop/applications/control_panel/desktop_management_panel.js",
       "erp_app/desktop/applications/control_panel/application_management_panel.js",
-      "erp_app/desktop/applications/control_panel/profile_management_panel.js",
       "erp_app/desktop/applications/web_navigator/module.js",
       "erp_app/ckeditor/ckeditor.js"
     )%>
@@ -100,7 +99,6 @@
           }
         </style>
     <%=setup_js_authentication(@user, @desktop)%>
-    <%=add_authenticity_token_to_extjs%>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
     <title>Compass Desktop</title>
   </head>
@@ -134,7 +132,7 @@
               data:[
                 {applicationId:0,name:"Control Panel",iconCls:"control-panel-win-shortcut",module:"control-panel-win",autoLoad:'na'},
                 {applicationId:0,name:"Web Navigator",iconCls:"web-navigator-win-shortcut",module:"web-navigator-win",autoLoad:'na'}<%=(@desktop.shortcuts.count > 0) ? ',' : '' %>
-				<%=@desktop.shortcuts.collect{|app| "{name:'#{app.description}',iconCls:'#{app.shortcut_id}-shortcut',module:'#{app.shortcut_id}'}"}.join(",")%>
+				        <%=raw @desktop.shortcuts.collect{|app| "{name:'#{app.description}',iconCls:'#{app.shortcut_id}-shortcut',module:'#{app.shortcut_id}'}"}.join(",")%>
               ]
             }),
             wallpaper:"/images/wallpaper/<%=@desktop.get_preference(:desktop_background) %>",
@@ -248,5 +246,6 @@
         <p style='margin-left: -110px; margin-top: 30px;'>Loading Compass Desktop...</p>
       </div>
     </div>
+    <%= setSessionTimeout %>
   </body>
 </html>

data/app/views/erp_app/login/index.erb

@@ -16,7 +16,7 @@
     <script type="text/javascript">
       Ext.onReady(function(){
           var appContainers = [['/erp_app/desktop/','Compass Desktop'],['/erp_app/organizer/','Compass Organizer']];
-          var loginWindow = new Compass.ErpApp.Login.Window({appContainers:appContainers, selectedAppContainerValue:'/erp_app/desktop/',redirectTo:'/erp_app/desktop/', logoutTo:'/erp_app/login', message:'<%=flash[:notice]%>', authenticity_token:'<%=form_authenticity_token%>'});
+          var loginWindow = Ext.create('Compass.ErpApp.Login.Window',{appContainers:appContainers, selectedAppContainerValue:'/erp_app/desktop/',redirectTo:'/erp_app/desktop/', logoutTo:'/erp_app/login', message:'<%=flash[:notice]%>', authenticity_token:'<%=form_authenticity_token%>'});
           loginWindow.show();
       });
     </script>

data/app/views/erp_app/mobile/base/index.erb

@@ -33,5 +33,6 @@
     <%= static_javascript_include_tag("erp_app/mobile/app.js")%>
   </head>
   <body>
+    <%= setSessionTimeout %>
   </body>
 </html>

data/app/views/erp_app/organizer/base/index.erb

@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
     <title>Organizer</title>
     <!-- include google maps -->
-     <script src="http://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>
+     <script src="https://maps.google.com/maps/api/js?sensor=false" type="text/javascript"></script>
     <!-- include google maps -->
     <!--javascript-->
     <%= include_extjs(:theme => @organizer.get_preference(:extjs_theme), :debug => (Rails.env != 'production')) %>
@@ -25,8 +25,6 @@
     <!-- application resources -->
     <%= static_stylesheet_link_tag(@organizer.applications.collect{|app| app.locate_resources('stylesheets')}.flatten)%>
     <!-- end application resources -->
-
-    <%=add_authenticity_token_to_extjs%>
   </head>
   <body scroll="no">
     <script type="text/javascript">
@@ -43,6 +41,7 @@
           organizerLayout.setup();
       });
     </script>
+    <%= setSessionTimeout %>
   </body>
 </html>
 

data/config/routes.rb

@@ -57,7 +57,6 @@ ErpApp::Engine.routes.draw do
   #control_panel
   match '/desktop/control_panel/application_management/:action(/:id)' => "desktop/control_panel/application_management"
   match '/desktop/control_panel/desktop_management/:action' => "desktop/control_panel/desktop_management"
-  match '/desktop/control_panel/profile_management/:action' => "desktop/control_panel/profile_management"
 
   #file_manager
   match '/desktop/file_manager/base/:action' => "desktop/file_manager/base"
@@ -76,6 +75,7 @@ ErpApp::Engine.routes.draw do
 
   #shared
   match '/shared/configuration/(/:action(/:id(/:category_id)))' => "shared/configuration"
+  match '/shared/profile_management/:action' => "shared/profile_management"
 end
 
 

data/lib/active_ext/ext_helpers/column_builder.rb

@@ -1,136 +1,136 @@
 module ActiveExt
-module ExtHelpers
-module ColumnBuilder
-
-  def self.build_column(column)
-    column_hash = nil
-    
-    #if this is an association sql_type will be blank, use string column
-    if column.sql_type.blank? || column.sql_type == NilClass
-      column_hash = self.send("build_string_column", column.name, column.options)
-    else
-      column_hash = self.send("build_#{column.sql_type.to_s}_column", column.name, column.options)
-    end
-
-    column_hash
-  end
-
-  private
-
-  def self.build_boolean_column(column_name, options={})
-    column = {
-      :header => column_name,
-      :type => 'date',
-      :dataIndex => column_name,
-      :width => options[:width].nil? ? 150 : options[:width],
-      :renderer => 'function(v) {
+  module ExtHelpers
+    module ColumnBuilder
+
+      def self.build_column(column)
+        column_hash = nil
+
+        #if this is an association sql_type will be blank, use string column
+        if column.sql_type.blank? || column.sql_type == NilClass
+          column_hash = self.send("build_string_column", column.name, column.options)
+        else
+          column_hash = self.send("build_#{column.sql_type.to_s}_column", column.name, column.options)
+        end
+
+        column_hash
+      end
+
+      private
+
+      def self.build_boolean_column(column_name, options={})
+        column = {
+            :header => column_name,
+            :type => 'date',
+            :dataIndex => column_name,
+            :width => options[:width].nil? ? 150 : options[:width],
+            :renderer => NonEscapeJsonString.new('function(v) {
         result = "False";
         
         if(v == 1){
           result = "True";
         }
         return result;
-      }'
-    }
+      }')
+        }
 
-    column[:editor] = {:xtype => "booleancolumneditor", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
+        column[:editor] = {:xtype => "booleancolumneditor", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
 
-    column
-  end
-  
-  def self.build_date_column(column_name, options={})
-    column = {
-      :header => column_name,
-      :type => 'date',
-      :dataIndex => column_name,
-      :width => options[:width].nil? ? 200 : options[:width],
-      :renderer => "Ext.util.Format.dateRenderer('m/d/Y')"
-    }
-
-    column[:editor] = {:xtype => "datefield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
-
-    column
-  end
-  
-  def self.build_datetime_column(column_name, options={})
-    column = {
-      :header => column_name,
-      :type => 'date',
-      :dataIndex => column_name,
-      :width => options[:width].nil? ? 200 : options[:width],
-      :renderer => "Ext.util.Format.dateRenderer('m/d/Y')"
-    }
-
-    column[:editor] = {:xtype => "datefield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
-
-    column
-  end
+        column
+      end
 
-  def self.build_string_column(column_name, options={})
-    column = {
-      :header => column_name,
-      :type => 'string',
-      :dataIndex => column_name,
-      :width => options[:width].nil? ? 150 : options[:width],
-    }
-
-    column[:editor] = {:xtype => "textfield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
-    
-    column
-  end
+      def self.build_date_column(column_name, options={})
+        column = {
+            :header => column_name,
+            :type => 'date',
+            :dataIndex => column_name,
+            :width => options[:width].nil? ? 200 : options[:width],
+            :renderer => NonEscapeJsonString.new("Ext.util.Format.dateRenderer('m/d/Y')")
+        }
 
-  def self.build_integer_column(column_name, options={})
-    column = {
-      :header => column_name,
-      :type => 'number',
-      :dataIndex => column_name,
-      :width => options[:width].nil? ? 150 : options[:width],
-    }
-
-    column[:editor] = {:xtype => "numberfield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
-    
-    column
-  end
+        column[:editor] = {:xtype => "datefield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
 
-  def self.build_decimal_column(column_name, options={})
-    column = {
-      :header => column_name,
-      :type => 'float',
-      :dataIndex => column_name,
-      :width => options[:width].nil? ? 150 : options[:width],
-    }
-
-    column[:editor] = {:xtype => "numberfield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
-    
-    column
-  end
+        column
+      end
 
-  def self.build_float_column(column_name, options={})
-    column = {
-      :header => column_name,
-      :type => 'float',
-      :dataIndex => column_name,
-      :width => options[:width].nil? ? 150 : options[:width],
-    }
-
-    column[:editor] = {:xtype => "numberfield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
-    
-    column
-  end
+      def self.build_datetime_column(column_name, options={})
+        column = {
+            :header => column_name,
+            :type => 'date',
+            :dataIndex => column_name,
+            :width => options[:width].nil? ? 200 : options[:width],
+            :renderer => NonEscapeJsonString.new("Ext.util.Format.dateRenderer('m/d/Y')")
+        }
 
-  def self.build_text_column(column_name, options={})
-    column = {
-      :header => column_name,
-      :type => 'string',
-      :dataIndex => column_name,
-      :width => options[:width].nil? ? 150 : options[:width],
-    }
+        column[:editor] = {:xtype => "datefield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
 
-    column[:editor] = {:xtype => "textarea", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
+        column
+      end
 
-    column
-  end
+      def self.build_string_column(column_name, options={})
+        column = {
+            :header => column_name,
+            :type => 'string',
+            :dataIndex => column_name,
+            :width => options[:width].nil? ? 150 : options[:width],
+        }
 
-end
-end
+        column[:editor] = {:xtype => "textfield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
+
+        column
+      end
+
+      def self.build_integer_column(column_name, options={})
+        column = {
+            :header => column_name,
+            :type => 'number',
+            :dataIndex => column_name,
+            :width => options[:width].nil? ? 150 : options[:width],
+        }
+
+        column[:editor] = {:xtype => "numberfield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
+
+        column
+      end
+
+      def self.build_decimal_column(column_name, options={})
+        column = {
+            :header => column_name,
+            :type => 'float',
+            :dataIndex => column_name,
+            :width => options[:width].nil? ? 150 : options[:width],
+        }
+
+        column[:editor] = {:xtype => "numberfield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
+
+        column
+      end
+
+      def self.build_float_column(column_name, options={})
+        column = {
+            :header => column_name,
+            :type => 'float',
+            :dataIndex => column_name,
+            :width => options[:width].nil? ? 150 : options[:width],
+        }
+
+        column[:editor] = {:xtype => "numberfield", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
+
+        column
+      end
+
+      def self.build_text_column(column_name, options={})
+        column = {
+            :header => column_name,
+            :type => 'string',
+            :dataIndex => column_name,
+            :width => options[:width].nil? ? 150 : options[:width],
+        }
+
+        column[:editor] = {:xtype => "textarea", :readOnly => options[:readonly].blank? ? false : options[:readonly]}
+
+        column
+      end
+
+    end
+  end
 end

data/lib/erp_app/config.rb

@@ -1,15 +1,19 @@
 module ErpApp
   module Config
     class << self
-      attr_accessor :widgets
+      attr_accessor :widgets, :session_warn_after, :session_redirect_after
 
       def init!
-        @defaults = {:@widgets => []}
+        @defaults = {
+            :@widgets => [],
+            :@session_warn_after => 18, #in minutes
+            :@session_redirect_after => 20,#in minutes
+        }
       end
 
       def reset!
-        @defaults.each do |k,v|
-          instance_variable_set(k,v)
+        @defaults.each do |k, v|
+          instance_variable_set(k, v)
         end
       end
 

data/lib/erp_app/extensions/railties/action_view/base.rb

@@ -8,5 +8,4 @@ ActionView::Base.class_eval do
   include ErpApp::Extensions::Railties::ActionView::Helpers::TagHelper
   include ErpApp::Extensions::Railties::ActionView::Helpers::ExtjsHelper
   include ErpApp::Extensions::Railties::ActionView::Helpers::ActiveExtHelper
-  
 end