erp_app 3.1.16 → 4.0.0

data/lib/active_ext/ext_helpers/field_builder.rb

@@ -1,146 +1,146 @@
 module ActiveExt
-module ExtHelpers
-module FieldBuilder
-  class << self
-
-    def build_field(column, value, display_only = false, hidden = false)
-      if display_only
-        field_json = display_field(column.options)
-      elsif hidden
-        field_json = hidden_field(column.options)
-      elsif column.options[:readonly]
-        field_json = display_field(column.options)
-      else
-        field_json = self.send("build_#{column.sql_type.to_s}_field", column.options)
-      end
-      
-      field_json[:fieldLabel] = column.name.to_s.humanize
-      field_json[:name] = column.name.to_s
-      field_json[:allowBlank] = !column.options[:required]
-
-      if display_only
-        value = format_display_value(column, value)
-      elsif column.options[:readonly]
-        value = format_display_value(column, value)
-      end
-
-      field_json[:value] = value
-
-      field_json
-    end
+  module ExtHelpers
+    module FieldBuilder
+      class << self
+
+        def build_field(column, value, display_only = false, hidden = false)
+          if display_only
+            field_json = display_field(column.options)
+          elsif hidden
+            field_json = hidden_field(column.options)
+          elsif column.options[:readonly]
+            field_json = display_field(column.options)
+          else
+            field_json = self.send("build_#{column.sql_type.to_s}_field", column.options)
+          end
+
+          field_json[:fieldLabel] = column.name.to_s.humanize
+          field_json[:name] = column.name.to_s
+          field_json[:allowBlank] = !column.options[:required]
+
+          if display_only
+            value = format_display_value(column, value)
+          elsif column.options[:readonly]
+            value = format_display_value(column, value)
+          end
+
+          field_json[:value] = value
+
+          field_json
+        end
+
+        def format_display_value(column, value)
+          if column.sql_type.to_s == 'date'
+            value = value.strfdate('%m/%d/%Y') unless value.nil?
+          elsif column.sql_type.to_s == 'datetime'
+            value = value.strftime('%m/%d/%Y') unless value.nil?
+          end
+
+          value
+        end
+
+        def hidden_field(options={})
+          field_json = {
+              :xtype => 'hidden'
+          }
+
+          field_json
+        end
+
+        def display_field(options={})
+          field_json = {
+              :width => 250,
+              :xtype => 'displayfield',
+              :labelWidth => 140
+          }
+
+          field_json
+        end
+
+        def build_boolean_field(options={})
+          field_json = {
+              :width => 250,
+              :xtype => 'combo',
+              :labelWidth => 140,
+              :forceSelection => true,
+              :store => [['true', 'True'], ['false', 'False']],
+              :triggerAction => 'all'
+          }
+
+          field_json
+        end
+
+        def build_date_field(options={})
+          field_json = {
+              :width => 250,
+              :xtype => 'datefield',
+              :labelWidth => 140
+          }
+
+          field_json
+        end
+
+        def build_datetime_field(options={})
+          field_json = {
+              :width => 150,
+              :xtype => 'datefield',
+              :labelWidth => 140
+          }
+
+          field_json
+        end
+
+        def build_string_field(options={})
+          field_json = {
+              :width => 250,
+              :xtype => 'textfield',
+              :labelWidth => 140
+          }
+
+          field_json
+        end
+
+        def build_integer_field(options={})
+          field_json = {
+              :width => 250,
+              :xtype => 'numberfield',
+              :labelWidth => 140
+          }
+
+          field_json
+        end
+
+        def build_decimal_field(options={})
+          field_json = {
+              :width => 250,
+              :xtype => 'numberfield',
+              :labelWidth => 140
+          }
+
+          field_json
+        end
+
+        def build_float_field(options={})
+          field_json = {
+              :width => 250,
+              :xtype => 'numberfield',
+              :labelWidth => 140
+          }
+
+          field_json
+        end
+
+        def build_text_field(options={})
+          field_json = {
+              :width => 150,
+              :xtype => 'textarea',
+              :labelWidth => 140
+          }
+
+          field_json
+        end
 
-    def format_display_value(column, value)
-      if column.sql_type.to_s == 'date'
-        value = value.strfdate('%m/%d/%Y') unless value.nil?
-      elsif column.sql_type.to_s == 'datetime'
-        value = value.strftime('%m/%d/%Y') unless value.nil?
       end
-
-      value
-    end
-
-    def hidden_field(options={})
-      field_json = {
-        :xtype => 'hidden'
-      }
-
-      field_json
-    end
-
-    def display_field(options={})
-      field_json = {
-        :width => 250,
-        :xtype => 'displayfield',
-        :labelWidth => 140
-      }
-
-      field_json
-    end
-
-    def build_boolean_field(options={})
-      field_json = {
-        :width => 250,
-        :xtype => 'combo',
-        :labelWidth => 140,
-        :forceSelection => true,
-        :store => [['true','True'],['false','False']],
-        :triggerAction => 'all'
-      }
-
-      field_json
-    end
-
-    def build_date_field(options={})
-      field_json = {
-        :width => 250,
-        :xtype => 'datefield',
-        :labelWidth => 140
-      }
-
-      field_json
-    end
-
-    def build_datetime_field(options={})
-      field_json = {
-        :width => 150,
-        :xtype => 'datefield',
-        :labelWidth => 140
-      }
-
-      field_json
-    end
-
-    def build_string_field(options={})
-      field_json = {
-        :width => 250,
-        :xtype => 'textfield',
-        :labelWidth => 140
-      }
-
-      field_json
-    end
-
-    def build_integer_field(options={})
-      field_json = {
-        :width => 250,
-        :xtype => 'numberfield',
-        :labelWidth => 140
-      }
-
-      field_json
-    end
-
-    def build_decimal_field(options={})
-      field_json = {
-        :width => 250,
-        :xtype => 'numberfield',
-        :labelWidth => 140
-      }
-
-      field_json
-    end
-
-    def build_float_field(options={})
-      field_json = {
-        :width => 250,
-        :xtype => 'numberfield',
-        :labelWidth => 140
-      }
-
-      field_json
     end
-
-    def build_text_field(options={})
-      field_json = {
-        :width => 150,
-        :xtype => 'textarea',
-        :labelWidth => 140
-      }
-
-      field_json
-    end
-
   end
-end
-end
 end

data/lib/erp_app/application_resource_loader/desktop_organizer_loader.rb

@@ -36,8 +36,7 @@ module ErpApp
           index = (@app_type == 'desktop') ? application_files.index{|x| x =~ /module.js/} : application_files.index{|x| x =~ /base.js/}
           first_load_js = application_files[index]
           application_files.delete_at(index)
-          application_files.push(first_load_js)
-          application_files.reverse!
+          application_files.unshift(first_load_js)
         end
         application_files.map!{|file| File.join("erp_app/#{@app_type}/applications/#{@app_name}",file)}
 

data/lib/erp_app/engine.rb

@@ -27,10 +27,5 @@ module ErpApp
     ErpBaseErpSvcs.register_as_compass_ae_engine(config, self)
     ::ErpApp::Widgets::Loader.load_root_widgets(config)
 
-  	config.to_prepare do
-      #will_paginate patch
-      require 'erp_app/extensions/will_paginate_patch'
-    end
-
   end
 end

data/lib/erp_app/extensions/active_record/has_user_preferences.rb

@@ -1,80 +1,81 @@
 module ErpApp
-	module Extensions
-		module ActiveRecord
-			module HasUserPreferences
+  module Extensions
+    module ActiveRecord
+      module HasUserPreferences
 
-				def self.included(base)
-				  base.extend(ClassMethods)
-				end
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
 
-				module ClassMethods
+        module ClassMethods
 
-					def has_user_preferences()
-						has_many :user_preferences, :as => :preferenced_record
+          def has_user_preferences()
+            has_many :user_preferences, :as => :preferenced_record
 
-						extend HasUserPreferences::SingletonMethods
-						include HasUserPreferences::InstanceMethods
-					end
-				end
+            extend HasUserPreferences::SingletonMethods
+            include HasUserPreferences::InstanceMethods
+          end
+        end
 
-				module SingletonMethods
-				end
+        module SingletonMethods
+        end
 
-				module InstanceMethods
-				
-				  def preferences(user)
-					  self.user_preferences.includes([:preference]).where('user_id = ?', user.id).map(&:preference)
-				  end
+        module InstanceMethods
 
-				  def set_user_preference(user, preference_type_iid, preference_option_lookup)
-					  preference_type = PreferenceType.find_by_internal_identifier(preference_type_iid.to_s)
-					  preference_option = nil
-					  #preference option can be set using 
-					  #:default [symbol which will set to default for preference type]
-					  #:preference_option_iid [the internal identifier for the preference option]
-					  #:value [the value of the preference_option]
-					  
-					  preference_option = preference_type.default_option if preference_option_lookup == :default
-					  preference_option = preference_type.preference_options.where('internal_identifier = ?', preference_option_lookup.to_s).first if preference_option.nil?
-					  preference_option = preference_type.preference_options.where('value = ?', preference_option_lookup.to_s).first if preference_option.nil?
+          def preferences(user)
+            self.user_preferences.includes([:preference]).where('user_id = ?', user.id).map(&:preference)
+          end
 
-					  if preference_option.nil?
-					    raise 'Invalid option for preference type'
-					  else
-					    preference = find_user_preference(user, preference_type)
-					    unless preference.nil?
-						    preference.preference_option = preference_option
-						    preference.save
-  					  else
-  						  preference = Preference.create(:preference_type => preference_type, :preference_option => preference_option)
-  						  self.user_preferences << UserPreference.create(:preference => preference, :user => user)
-  						  self.save
-  					  end
-  					end
-				  end
+          def set_user_preference(user, preference_type_iid, preference_option_lookup)
+            preference_type = PreferenceType.find_by_internal_identifier(preference_type_iid.to_s)
+            preference_option = nil
+            #preference option can be set using
+            #:default [symbol which will set to default for preference type]
+            #:preference_option_iid [the internal identifier for the preference option]
+            #:value [the value of the preference_option]
 
-				  def get_user_preference(user, preference_type_iid)
-					preference_type = PreferenceType.find_by_internal_identifier(preference_type_iid.to_s)
-					preference = find_user_preference(user, preference_type)
-					if preference.nil?
-					  preference_type.default_preference_option.value
-					else
-					  preference.preference_option.value
-					end
-				  end
-				  
-				  private
+            preference_option = preference_type.default_option if preference_option_lookup == :default
+            preference_option = preference_type.preference_options.where('internal_identifier = ?', preference_option_lookup.to_s).first if preference_option.nil?
+            preference_option = preference_type.preference_options.where('value = ?', preference_option_lookup.to_s).first if preference_option.nil?
 
-				  def find_user_preference(user, preference_type)
-					preference = nil
-					results = self.user_preferences.includes([:preference]).where('user_id = ? and preferences.preference_type_id = ?', user.id, preference_type.id)
-					if !results.nil? && !results.empty?
-					  preference = results.first.preference
-					end
-					preference
-				  end
-				end
-			end
-		end
-	end
-end
+            if preference_option.nil?
+              raise 'Invalid option for preference type'
+            else
+              preference = find_user_preference(user, preference_type)
+              unless preference.nil?
+                preference.preference_option = preference_option
+                preference.save
+              else
+                preference = Preference.create(:preference_type => preference_type, :preference_option => preference_option)
+                self.user_preferences << UserPreference.create(:preference => preference, :user => user)
+                self.save
+              end
+            end
+          end
+
+          def get_user_preference(user, preference_type_iid)
+            preference_type = PreferenceType.find_by_internal_identifier(preference_type_iid.to_s)
+            preference = find_user_preference(user, preference_type)
+            if preference.nil?
+              preference_type.default_preference_option.value
+            else
+              preference.preference_option.value
+            end
+          end
+
+          private
+
+          def find_user_preference(user, preference_type)
+            preference = nil
+            results = self.user_preferences.includes([:preference]).where('user_id = ? and preferences.preference_type_id = ?', user.id, preference_type.id)
+            if !results.nil? && !results.empty?
+              preference = results.first.preference
+            end
+            preference
+          end
+        end
+
+      end # HasUserPreferences
+    end # ActiveRecord
+  end # Extensions
+end # ErpApp

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

@@ -18,38 +18,36 @@ module ErpApp
                   end
             end
 
-            def setup_js_authentication(user, app_container)
-              current_user = {
-                  :username => user.username,
-                  :lastloginAt => user.last_login_at,
-                  :lastActivityAt => user.last_activity_at,
-                  :failedLoginCount => user.failed_logins_count,
-                  :email => user.email,
-                  :roles => user.all_roles.collect { |role| role.internal_identifier },
-                  :capabilities => user.class_capabilities_to_hash,
-                  :id => user.id,
-                  :description => user.party.to_s
-              }
-              js_string = static_javascript_include_tag('erp_app/authentication/compass_user.js')
-              js_string << (raw "<script type='text/javascript'>var currentUser = new ErpApp.CompassAccessNegotiator.CompassUser(#{current_user.to_json});</script>")
-              js_string
+            def setup_js_authentication(user=current_user)
+              # only setup user if a current_user is logged in
+              if current_user
+                current_user = {
+                    :username => user.username,
+                    :lastloginAt => user.last_login_at,
+                    :lastActivityAt => user.last_activity_at,
+                    :failedLoginCount => user.failed_logins_count,
+                    :email => user.email,
+                    :roles => user.all_roles.collect { |role| role.internal_identifier },
+                    :capabilities => user.class_capabilities_to_hash,
+                    :id => user.id,
+                    :partyId => user.party.id,
+                    :description => user.party.to_s
+                }
+                js_string = static_javascript_include_tag('erp_app/authentication/compass_user.js')
+                js_string << (raw "<script type='text/javascript'>var currentUser = new ErpApp.CompassAccessNegotiator.CompassUser(#{current_user.to_json});</script>")
+                js_string
+              end
             end
 
-            def include_code_mirror_library
+            def include_code_mirror_library(theme='vibrant-ink')
               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/"+theme+".css\" />")
               resources
             end
 
-            def include_compass_ae_instance_about
+            def include_compass_ae_instance
               compass_ae_instance = CompassAeInstance.find_by_internal_identifier('base')
               json_hash = {
                   :version => compass_ae_instance.version,
@@ -61,14 +59,18 @@ module ErpApp
               raw "<script type=\"text/javascript\">compassAeInstance = #{json_hash.to_json};</script>"
             end
 
-            def setSessionTimeout(warn_milli_seconds=((ErpApp::Config.session_warn_after*60)*1000),
+            def set_session_timeout(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>" if current_user
             end
 
-            #need to remove camel case not rubyish
-            alias_method :set_session_timeout, :setSessionTimeout
+            def set_authenticity_token
+              raw "<script type='text/javascript'>Compass.ErpApp.Utility.createNamespace('Compass.ErpApp'); Compass.ErpApp.AuthentictyToken = '#{form_authenticity_token}';</script>" if current_user
+            end
+
+            # need to remove camel case not rubyish, will be deprecated at some point
+            alias_method :setSessionTimeout, :set_session_timeout
 
             def load_shared_application_resources(resource_type)
               resource_type = resource_type.to_sym

data/lib/erp_app/version.rb

@@ -1,10 +1,14 @@
 module ErpApp
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 1
-    TINY  = 16
+    MAJOR = 4
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end
+
+  def self.version
+    ErpApp::VERSION::STRING
+  end
 end
 

data/lib/erp_app/widgets/base.rb

@@ -1,7 +1,7 @@
 
 # == Basic overview
 # Based on ideas and code snippits from Cell plugin this library allows you
-# to imbed a reusable component into view that is decoupled from the controller
+# to embed a reusable component into view that is decoupled from the controller
 # and view it resides in. It can have its own MVC lifecycle independent of its parent
 # view.
 
@@ -22,8 +22,8 @@ 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 => :proxy_controller
+      delegate :redirect_to, :config, :params, :session, :request, :logger, :logged_in?, :current_user, :login,
+               :flash, :update_div_id, :update_html, :current_theme_paths, :request, :to => :proxy_controller
 
       attr_reader   :state_name
       attr_accessor :proxy_controller, :name, :div_id,:html, :view, :uuid, :widget_params
@@ -66,6 +66,24 @@ module ErpApp
         self.lookup_context.find_template(view).virtual_path
       end
 
+      def send_file(path, options = {})
+        proxy_controller.send_file(path, options)
+
+       {send_file: true}
+      end
+
+      def send_data(data, options = {})
+        proxy_controller.send_data(data, options)
+
+        {send_data: true}
+      end
+
+      def redirect_to(options = {}, response_status = {})
+        proxy_controller.redirect_to(options, response_status)
+
+        {redirect_to: true}
+      end
+
       private
 
       def render_view_for(view, *args)
@@ -127,7 +145,6 @@ module ErpApp
           widget = Rails.application.config.erp_app.widgets.find{|item| item[:name] == self.widget_name}
           paths = widget[:view_paths]
 
-          paths.reverse!
           ActionView::Base.new(paths).render(:template => view, :locals => locals)
         end
 

data/lib/erp_app/widgets/loader.rb

@@ -61,7 +61,7 @@ module ErpApp
             #add any additional view paths to widgets
             if File.directory?(File.join(widgets_path,widget_name,'views'))
               view_path = File.join(widgets_path,widget_name,'views')
-              widget_hash[:view_paths] << view_path
+              widget_hash[:view_paths].unshift(view_path)
               #get all view files for theme generation
               get_widget_view_files(widget_hash, view_path)
             end
@@ -118,7 +118,7 @@ module ErpApp
             if File.directory?(File.join(Rails.root,"lib/extensions/widgets",widget_hash[:name],'views'))
               view_path = File.join(Rails.root,"lib/extensions/widgets",widget_hash[:name],'views')
               widget_hash = Rails.application.config.erp_app.widgets.find{|item| item[:name] == widget_hash[:name]}
-              widget_hash[:view_paths] << view_path
+              widget_hash[:view_paths].push(view_path)
               #get all view files for theme generation
               get_widget_view_files(widget_hash, view_path)
             end

data/lib/erp_app.rb

@@ -3,6 +3,7 @@ require 'compass_ae_sencha'
 require 'erp_tech_svcs'
 require 'will_paginate'
 require 'uglifier'
+require 'friendly_id'
 
 require "erp_app/version"
 require "erp_app/extensions"

data/lib/generators/cms_widget/USAGE

@@ -13,9 +13,3 @@ Example:
         3. views folder with index.html.erb
 
         4. Widgets::[widget_name]::Base class that extends from ErpApp::Widgets::Base
-
-
-
-
-
-

data/lib/generators/cms_widget/templates/javascript/base.js.erb

@@ -8,5 +8,5 @@ Compass.ErpApp.Widgets.AvailableWidgets.push({
     name:'<%= description %>',
     iconUrl:'<%= icon_url %>',
     onClick:Compass.ErpApp.Widgets.<%=class_name%>.addWidget,
-    about:'What my new widget is about'
+    about:"<%= description %>"
 });