erp_app 3.0.7 → 3.0.8

data/lib/erp_app/extensions/railties/action_view/helpers/include_helper.rb

@@ -14,7 +14,7 @@ module ErpApp
             end
       
             def set_max_file_upload
-              raw "<script type='text/javascript'>Ext.ns('ErpApp.FileUpload'); ErpApp.FileUpload.maxSize = #{Rails.application.config.erp_tech_svcs.max_file_size_in_mb.megabytes};</script>"
+              raw "<script type='text/javascript'>Ext.ns('ErpApp.FileUpload'); ErpApp.FileUpload.maxSize = #{Rails.application.config.erp_tech_svcs.max_file_size_in_mb};</script>"
             end
 
             def include_extjs(opt={})
@@ -36,6 +36,8 @@ module ErpApp
               else
                 resources << static_stylesheet_link_tag("extjs/resources/css/ext-all.css")
               end
+
+              resources << add_authenticity_token_to_extjs
         
               raw resources
             end
@@ -92,8 +94,15 @@ module ErpApp
 
             def include_code_mirror_library
               resources = static_javascript_include_tag("erp_app/codemirror/lib/codemirror.js")
+              resources << static_javascript_include_tag("erp_app/codemirror/mode/htmlmixed/htmlmixed.js")              
+              resources << static_javascript_include_tag("erp_app/codemirror/mode/xml/xml.js")
+              resources << static_javascript_include_tag("erp_app/codemirror/mode/css/css.js")
+              resources << static_javascript_include_tag("erp_app/codemirror/mode/javascript/javascript.js")
+              resources << static_javascript_include_tag("erp_app/codemirror/mode/ruby/ruby.js")
+              resources << static_javascript_include_tag("erp_app/codemirror/mode/yaml/yaml.js")
+              resources << static_javascript_include_tag("erp_app/codemirror/lib/util/runmode.js")
+              resources << static_javascript_include_tag("erp_app/codemirror_highlight.js")
               resources << (raw "<link rel=\"stylesheet\" type=\"text/css\" href=\"/javascripts/erp_app/codemirror/lib/codemirror.css\" />")
-              resources << (raw "<link rel=\"stylesheet\" type=\"text/css\" href=\"/javascripts/erp_app/codemirror/theme/default.css\" />")
               resources
             end
       
@@ -109,13 +118,19 @@ module ErpApp
             end
 
             def add_authenticity_token_to_extjs
-              raw "<script type='text/javascript'>Ext.Ajax.extraParams = { authenticity_token: '#{form_authenticity_token}' }; Compass.ErpApp.AuthentictyToken = '#{form_authenticity_token}';</script>"
+              raw "<script type='text/javascript'>Ext.ns('Compass.ErpApp'); Ext.Ajax.extraParams = { authenticity_token: '#{form_authenticity_token}' }; Compass.ErpApp.AuthentictyToken = '#{form_authenticity_token}';</script>"
             end
 
             def create_authenticity_token_sencha_touch_field
               raw "<script type='text/javascript'>Compass.ErpApp.Mobile.AuthentictyTokenField = {xtype:'hiddenfield', name:'authenticity_token', value:'#{form_authenticity_token}'}; </script>"
             end
 
+            def setSessionTimeout(warn_milli_seconds=((ErpApp::Config.session_warn_after*60)*1000),
+                                  redirect_milli_seconds=((ErpApp::Config.session_redirect_after*60)*1000),
+                                  redirect_to='/session/sign_out')
+              raw "<script type='text/javascript'>Compass.ErpApp.Utility.SessionTimeout.setupSessionTimeout(#{warn_milli_seconds}, #{redirect_milli_seconds}, '#{redirect_to}') </script>" unless current_user === false
+            end
+
             def load_shared_application_resources(resource_type)
               resource_type = resource_type.to_sym
               case resource_type

data/lib/erp_app/version.rb

@@ -2,7 +2,7 @@ module ErpApp
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/lib/erp_app/widgets/base.rb

@@ -19,10 +19,11 @@ module ErpApp
 
       IGNORED_PARAMS = %w{action controller uuid widget_name widget_action dynamic_form_id dynamic_form_model_id model_name use_dynamic_form authenticity_token is_html_form commit utf8}
 
-      delegate :config, :params, :session, :request, :logger, :logged_in?, :current_user, :flash, :update_div_id, :update_html, :current_theme_paths, :request, :send_data, :to => :controller
+      delegate :config, :params, :session, :request, :logger, :logged_in?, :current_user,
+               :flash, :update_div_id, :update_html, :current_theme_paths, :request, :send_data, :to => :proxy_controller
 
       attr_reader   :state_name
-      attr_accessor :controller, :name, :div_id,:html, :view, :uuid, :widget_params
+      attr_accessor :proxy_controller, :name, :div_id,:html, :view, :uuid, :widget_params
       cattr_accessor :view_resolver_cache
 
       def log(*args); end
@@ -31,10 +32,10 @@ module ErpApp
         self.response_body = super
       end
 
-      def initialize(controller=nil, name=nil, view=nil, uuid=nil, widget_params=nil, website=nil)
+      def initialize(proxy_controller=nil, name=nil, view=nil, uuid=nil, widget_params=nil)
         ErpApp::Widgets::Base.view_resolver_cache = [] if ErpApp::Widgets::Base.view_resolver_cache.nil?
         self.name = name
-        self.controller = controller
+        self.proxy_controller = proxy_controller
         self.view = view
         self.uuid = uuid
         self.widget_params = widget_params

data/lib/erp_app/widgets/loader.rb

@@ -48,7 +48,7 @@ module ErpApp
           helpers.delete_if{|name| name =~ /^\./}
           helpers.each do |helper|
             load File.join(path,helper)
-            ActionView::Base.send(:include, File.basename(helper, ".rb").classify.constantize)
+            ActionView::Base.send(:include, File.basename(helper, ".rb").camelize.constantize)
           end
         end
 
@@ -57,7 +57,7 @@ module ErpApp
           helpers.delete_if{|name| name =~ /^\./}
           helpers.each do |helper|
             load File.join(path,helper)
-            "Widgets::#{widget_hash[:name].classify}::Base".constantize.send(:include, File.basename(helper, ".rb").classify.constantize)
+            "Widgets::#{widget_hash[:name].camelize}::Base".constantize.send(:include, File.basename(helper, ".rb").camelize.constantize)
           end
         end