netzke-basepack 0.6.3 → 0.6.4

data/javascripts/datetimefield.js

@@ -0,0 +1,24 @@
+/**
+ * Ext.ux.DateTimePicker & Ext.ux.form.DateTimeField
+ * http://www.sencha.com/forum/showthread.php?98292-DateTime-field-again-and-again-)
+ * Copyright(c) 2011, Andrew Pleshkov andrew.pleshkov@gmail.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+Ext.namespace("Ext.ux");(function(){var a=Ext.ux;a.BaseTimePicker=Ext.extend(Ext.Panel,{timeFormat:"g:i A",header:true,nowText:"Now",doneText:"Done",hourIncrement:1,minIncrement:1,hoursLabel:"Hours",minsLabel:"Minutes",cls:"ux-base-time-picker",width:210,layout:"form",labelAlign:"top",initComponent:function(){this.addEvents("select");this.hourSlider=new Ext.slider.SingleSlider({increment:this.hourIncrement,minValue:0,maxValue:23,fieldLabel:this.hoursLabel,listeners:{change:this._updateTimeValue,scope:this},plugins:new Ext.slider.Tip()});this.minSlider=new Ext.slider.SingleSlider({increment:this.minIncrement,minValue:0,maxValue:59,fieldLabel:this.minsLabel,listeners:{change:this._updateTimeValue,scope:this},plugins:new Ext.slider.Tip()});this.setCurrentTime(false);this.items=[this.hourSlider,this.minSlider];this.bbar=[{text:this.nowText,handler:this.setCurrentTime,scope:this},"->",{text:this.doneText,handler:this.onDone,scope:this}];a.BaseTimePicker.superclass.initComponent.call(this)},setCurrentTime:function(b){this.setValue(new Date(),!!b)},onDone:function(){this.fireEvent("select",this,this.getValue())},setValue:function(c,b){this.hourSlider.setValue(c.getHours(),b);this.minSlider.setValue(c.getMinutes(),b);this._updateTimeValue()},_extractValue:function(){var b=new Date();b.setHours(this.hourSlider.getValue());b.setMinutes(this.minSlider.getValue());return b},getValue:function(){return this._extractValue()},_updateTimeValue:function(){var b=this._extractValue().format(this.timeFormat);if(this.rendered){this.setTitle(b)}},afterRender:function(){a.BaseTimePicker.superclass.afterRender.call(this);this._updateTimeValue()},destroy:function(){this.purgeListeners();this.hourSlider=null;this.minSlider=null;a.BaseTimePicker.superclass.destroy.call(this)}});Ext.reg("basetimepicker",a.BaseTimePicker)})();Ext.namespace("Ext.ux");(function(){var a=Ext.ux;var c="ux-date-time-picker";a.DateTimePicker=Ext.extend(Ext.BoxComponent,{timeLabel:"Time",timeFormat:"g:i A",changeTimeText:"Change...",doneText:"Done",initComponent:function(){a.DateTimePicker.superclass.initComponent.call(this);this.addEvents("select");this.timePickerButton=new Ext.Button({text:this.changeTimeText,handler:this._showTimePicker,scope:this});this._initDatePicker();this.timeValue=new Date();if(this.value){this.setValue(this.value);delete this.value}},_initTimePicker:function(){if(!this.timeMenu){var d=this.initialConfig.timeMenu;if(d&&d.xtype){this.timeMenu=Ext.create(d)}else{var e=Ext.create(Ext.applyIf(this.initialConfig.timePicker||{},{timeFormat:this.timeFormat}),"basetimepicker");this.timeMenu=new b(e,d||{})}if(!Ext.isFunction(this.timeMenu.getPicker)){throw"Your time menu must provide the getPicker() method"}this.timeMenu.on("timeselect",this.onTimeSelect,this)}},_initDatePicker:function(){var e=this.initialConfig.datePicker||{};e.internalRender=this.initialConfig.internalRender;Ext.applyIf(e,{format:this.dateFormat||Ext.DatePicker.prototype.format});var d=this.datePicker=Ext.create(e,"datepicker");d.update=d.update.createSequence(function(){if(this.el!=null&&this.datePicker.rendered){var f=this.datePicker.el.getWidth();this.el.setWidth(f+this.el.getBorderWidth("lr")+this.el.getPadding("lr"))}},this)},_renderDatePicker:function(g){var e=this.datePicker;e.render(g);var j=e.getEl().child(".x-date-bottom");var f=j.getSize(true);var h=["position: absolute","bottom: 0","left: 0","overflow: hidden","width: "+f.width+"px","height: "+f.height+"px"].join(";");var i=g.createChild({tag:"div",cls:"x-date-bottom",style:h,children:[{tag:"table",cellspacing:0,style:"width: 100%",children:[{tag:"tr",children:[{tag:"td",align:"left"},{tag:"td",align:"right"}]}]}]});if(e.showToday){var d={};Ext.each(["text","tooltip","handler","scope"],function(k){d[k]=e.todayBtn.initialConfig[k]});this.todayBtn=new Ext.Button(d).render(i.child("td:first"))}this.doneBtn=new Ext.Button({text:this.doneText,handler:this.onDone,scope:this}).render(i.child("td:last"))},_getFormattedTimeValue:function(d){return d.format(this.timeFormat)},_renderValueField:function(f){var e=c+"-value-ct";var d=!Ext.isEmpty(this.timeLabel)?'<span class="'+e+'-value-label">'+this.timeLabel+":</span>&nbsp;":"";var h=f.insertFirst({tag:"div",cls:[e,"x-date-bottom"].join(" ")});var g=h.createChild({tag:"table",cellspacing:0,style:"width: 100%",children:[{tag:"tr",children:[{tag:"td",align:"left",cls:e+"-value-cell",html:'<div class="'+e+'-value-wrap">'+d+'<span class="'+e+'-value">'+this._getFormattedTimeValue(this.timeValue)+"</span></div>"},{tag:"td",align:"right",cls:e+"-btn-cell"}]}]});this.timeValueEl=g.child("."+e+"-value");this.timeValueEl.on("click",this._showTimePicker,this);this.timePickerButton.render(g.child("td:last"))},onRender:function(e,d){this.el=e.createChild({tag:"div",cls:c,children:[{tag:"div",cls:c+"-inner"}]},d);a.DateTimePicker.superclass.onRender.call(this,e,d);var f=this.el.first();this._renderDatePicker(f);this._renderValueField(f)},_updateTimeValue:function(d){this.timeValue=d;if(this.timeValueEl!=null){this.timeValueEl.update(this._getFormattedTimeValue(d))}},setValue:function(d){this._updateTimeValue(d);this.datePicker.setValue(d.clone())},getValue:function(){var d=this.datePicker.getValue();var e=this.timeValue.getElapsed(this.timeValue.clone().clearTime());return new Date(d.getTime()+e)},onTimeSelect:function(f,d,e){this._updateTimeValue(e)},_showTimePicker:function(){this._initTimePicker();this.timeMenu.getPicker().setValue(this.timeValue,false);if(this.timeMenu.isVisible()){this.timeMenu.hide()}else{this.timeMenu.show(this.timePickerButton.el,null,this.parentMenu)}},onDone:function(){this.fireEvent("select",this,this.getValue())},destroy:function(){Ext.destroy(this.timePickerButton);this.timePickerButton=null;if(this.timeValueEl){this.timeValueEl.remove();this.timeValueEl=null}Ext.destroy(this.datePicker);this.datePicker=null;if(this.timeMenu){Ext.destroy(this.timeMenu);this.timeMenu=null}if(this.todayBtn){Ext.destroy(this.todayBtn);this.todayBtn=null}if(this.doneBtn){Ext.destroy(this.doneBtn);this.doneBtn=null}this.parentMenu=null;a.DateTimePicker.superclass.destroy.call(this)}});Ext.reg("datetimepicker",a.DateTimePicker);var b=a.DateTimePicker.Menu=Ext.extend(Ext.menu.Menu,{enableScrolling:false,hideOnClick:false,plain:true,showSeparator:false,constructor:function(e,d){d=d||{};if(d.picker){delete d.picker}this.picker=Ext.create(e);b.superclass.constructor.call(this,Ext.applyIf({items:this.picker},d));this.addEvents("timeselect");this.picker.on("select",this.onTimeSelect,this)},getPicker:function(){return this.picker},onTimeSelect:function(d,e){this.hide();this.fireEvent("timeselect",this,d,e)},destroy:function(){this.purgeListeners();this.picker=null;b.superclass.destroy.call(this)}})})();Ext.namespace("Ext.ux.form");(function(){var c=Ext.ux.form;var a=Ext.isIE7&&Ext.isStrict;var b=Ext.extend(Ext.menu.Menu,{enableScrolling:false,plain:true,showSeparator:false,hideOnClick:true,pickerId:null,cls:"x-date-menu x-date-time-menu",constructor:function(e,d){b.superclass.constructor.call(this,Ext.applyIf({items:e},d||{}));this.primaryPicker=e;e.parentMenu=this;this.on("beforeshow",this.onBeforeShow,this);this.strict=a;if(this.strict){this.on("show",this.onShow,this,{single:true,delay:20})}this.picker=e.datePicker;this.relayEvents(e,["select"]);this.on("show",e.focus,e);this.on("select",this.menuHide,this);if(this.handler){this.on("select",this.handler,this.scope||this)}},menuHide:function(){if(this.hideOnClick){this.hide(true)}},onBeforeShow:function(){if(this.picker){this.picker.hideMonthPicker(true)}},onShow:function(){var d=this.picker.getEl();d.setWidth(d.getWidth())},destroy:function(){this.primaryPicker=null;this.picker=null;b.superclass.destroy.call(this)}});c.DateTimeField=Ext.extend(Ext.form.DateField,{timeFormat:"g:i A",defaultAutoCreate:{tag:"input",type:"text",size:"22",autocomplete:"off"},initComponent:function(){c.DateTimeField.superclass.initComponent.call(this);this.dateFormat=this.dateFormat||this.format;var d=this._createPicker();this.format=this.dateFormat+" "+this.timeFormat;this.menu=new b(d,{hideOnClick:false})},_createPicker:function(){var d=this.initialConfig.picker||{};Ext.apply(d,{ctCls:"x-menu-date-item",internalRender:a||!Ext.isIE});Ext.applyIf(d,{dateFormat:this.dateFormat,timeFormat:this.timeFormat});return Ext.create(d,"datetimepicker")},onTriggerClick:function(){c.DateTimeField.superclass.onTriggerClick.apply(this,arguments);this.menu.primaryPicker.setValue(this.getValue()||new Date())}});Ext.reg("datetimefield",c.DateTimeField)})();

data/lib/generators/netzke/basepack_generator.rb

@@ -0,0 +1,10 @@
+module Netzke
+  class BasepackGenerator < ::Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+
+    desc 'Copies necessary assets to public/netzke/basepack'
+    def execute
+      copy_file 'assets/ts-checkbox.gif', "public/netzke/basepack/ts-checkbox.gif"
+    end
+  end
+end

data/lib/netzke-basepack.rb

@@ -2,56 +2,18 @@
 require 'netzke-core'
 require 'active_support/dependencies'
 
-# path = File.dirname(__FILE__)
-# $LOAD_PATH << path
-
 # Make components auto-loadable
 ActiveSupport::Dependencies.autoload_paths << File.dirname(__FILE__)
 
 require 'netzke/basepack'
 
 module Netzke
-  autoload :Ext, 'ext'
-
   module Basepack
-    class Engine < ::Rails::Engine
-      config.before_initialize do
-        I18n.load_path << File.dirname(__FILE__) + '/../locales/en.yml'
-      end
+    class Engine < Rails::Engine
     end
   end
-
 end
 
-Netzke::Basepack.init
-
-# Netzke::Core.javascripts << "#{File.dirname(__FILE__)}/../../javascripts/basepack.js"
-# Netzke::Core.stylesheets << "#{File.dirname(__FILE__)}/../../stylesheets/basepack.css"
-
-# Make this plugin auto-reloadable for easier development
-# ActiveSupport::Dependencies.autoload_once_paths.delete(path)
-
-# Make gem's models auto-loadable
-# %w{ models }.each do |dir|
-#   path = File.join(File.dirname(__FILE__), 'app', dir)
-#   $LOAD_PATH << path
-#   ActiveSupport::Dependencies.autoload_paths << path
-#   ActiveSupport::Dependencies.autoload_once_paths.delete(path)
-# end
-
-# Include javascript & styles required by all basepack components.
-# These files will get loaded at the initial load of the framework (along with Ext and Netzke-core).
-
-
-# FIXME: The following stylesheet inclusion doesn't *really* belong here, being component-specific,
-# but I don't see any other solution for now. The problem is that these stylesheets come straight from
-# Ext JS, having *relative* URLs to the images, which doesn't allow us to include them all together as those stylesheets
-# from Netzke.
-
-# Used by FormPanel (file upload field)
-# Netzke::Base.config[:external_css] << "/extjs/examples/ux/fileuploadfield/css/fileuploadfield"
-
-# Used by GridPanel
-# Netzke::Base.config[:external_css] << "/extjs/examples/ux/gridfilters/css/RangeMenu"
-# Netzke::Base.config[:external_css] << "/extjs/examples/ux/gridfilters/css/GridFilters"
+I18n.load_path << File.dirname(__FILE__) + '/../locales/en.yml'
 
+Netzke::Basepack.init

data/lib/netzke/active_record/attributes.rb

@@ -138,7 +138,7 @@ module Netzke
         res = []
         for a in attributes
           next if a[:included] == false
-          res << value_for_attribute(a)
+          res << value_for_attribute(a, a[:nested_attribute])
         end
         res
       end
@@ -148,26 +148,33 @@ module Netzke
         res = {}
         for a in (attributes.is_a?(Hash) ? attributes.values : attributes)
           next if a[:included] == false
-          res[a[:name].to_sym] = self.value_for_attribute(a)
+          res[a[:name].to_sym] = self.value_for_attribute(a, a[:nested_attribute])
         end
         res
       end
 
       # Fetches the value specified by an (association) attribute
-      def value_for_attribute(a)
+      # If +through_association+ is true, get the value of the association by provided method, *not* the associated record's id
+      # E.g., author__name with through_association set to true may return "Vladimir Nabokov", while with through_association set to false, it'll return author_id for the current record
+      def value_for_attribute(a, through_association = false)
         v = if a[:getter]
           a[:getter].call(self)
         elsif respond_to?("#{a[:name]}")
           send("#{a[:name]}")
         elsif is_association_attr?(a)
           split = a[:name].to_s.split(/\.|__/)
-          split.inject(self) do |r,m|
-            if r.respond_to?(m)
-              r.send(m)# unless res.nil?
-            else
-              logger.debug "!!! Netzke::Basepack: Wrong attribute name: #{a[:name]}" unless r.nil?
-              nil
+          assoc = self.class.reflect_on_association(split.first.to_sym)
+          if through_association
+            split.inject(self) do |r,m| # TODO: do we really need to descend deeper than 1 level?
+              if r.respond_to?(m)
+                r.send(m)
+              else
+                logger.debug "!!! Netzke::Basepack: Wrong attribute name: #{a[:name]}" unless r.nil?
+                nil
+              end
             end
+          else
+            self.send("#{assoc.options[:foreign_key] || assoc.name.to_s.foreign_key}")
           end
         end
 
@@ -205,18 +212,7 @@ module Netzke
                     # what should we do in this case?
                   end
                 else
-                  begin
-                    assoc_instance = assoc.klass.send("find_by_#{assoc_method}", v)
-                  rescue NoMethodError
-                    assoc_instance = nil
-                    logger.debug "!!! Netzke::Basepack: No find_by_#{assoc_method} method for class #{assoc.klass.name}\n"
-                  end
-                  if (assoc_instance)
-                    # we found association instance to assign
-                    self.send("#{split.first}=", assoc_instance)
-                  else
-                    logger.debug "!!! Netzke::Basepack: Couldn't find association #{split.first} by #{assoc_method} '#{v}'"
-                  end
+                  self.send("#{assoc.options[:foreign_key] || assoc.name.to_s.foreign_key}=", v)
                 end
               else
                 logger.debug "!!! Netzke::Basepack: Association #{assoc} is not known for class #{self.class.name}"

data/lib/netzke/basepack.rb

@@ -8,9 +8,13 @@ module Netzke
     mattr_accessor :icons_uri
 
     class << self
+
       # Called from netzke-basepack.rb
       def init
+        Netzke::Core.ext_javascripts << "#{File.dirname(__FILE__)}/../../javascripts/datetimefield.js"
         Netzke::Core.ext_javascripts << "#{File.dirname(__FILE__)}/../../javascripts/basepack.js"
+
+        Netzke::Core.ext_stylesheets << "#{File.dirname(__FILE__)}/../../stylesheets/datetimefield.css"
         Netzke::Core.ext_stylesheets << "#{File.dirname(__FILE__)}/../../stylesheets/basepack.css"
 
         Netzke::Core.external_ext_css << "/extjs/examples/ux/gridfilters/css/RangeMenu"
@@ -26,5 +30,6 @@ module Netzke
         yield self
       end
     end
+
   end
-end
+end

data/lib/netzke/basepack/data_accessor.rb

@@ -0,0 +1,166 @@
+require 'netzke/active_record'
+
+module Netzke
+  module Basepack
+    # This module is included into such data-driven components as GridPanel, FormPanel, PagingFormPanel, etc.
+    module DataAccessor
+
+      # Returns options for comboboxes in grids/forms
+      def combobox_options_for_column(column, method_options = {})
+        query = method_options[:query]
+
+        # First, check if we have options for this column defined in persistent storage
+        options = column[:combobox_options] && column[:combobox_options].split("\n")
+        if options
+          query ? options.select{ |o| o.index(/^#{query}/) }.map{ |el| [el] } : options
+        else
+          assoc, assoc_method = assoc_and_assoc_method_for_column(column)
+
+          if assoc
+            # Options for an asssociation attribute
+
+            relation = assoc.klass.scoped
+
+            relation = relation.extend_with(method_options[:scope]) if method_options[:scope]
+
+            if assoc.klass.column_names.include?(assoc_method)
+              # apply query
+              relation = relation.where(:"#{assoc_method}".like => "#{query}%") if query.present?
+              relation.all.map{ |r| [r.id, r.send(assoc_method)] }
+            else
+              relation.all.map{ |r| [r.id, r.send(assoc_method)] }.select{ |id,value| value =~ /^#{query}/ }
+            end
+
+          else
+            # Options for a non-association attribute
+            res=data_class.netzke_combo_options_for(column[:name], method_options)
+
+            # ensure it is an array-in-array, as Ext will fail otherwise
+            raise RuntimeError, "netzke_combo_options_for should return an Array" unless res.kind_of? Array
+            return [[]] if res.empty?
+
+            unless res.first.kind_of? Array
+              res=res.map do |v|
+                [v]
+              end
+            end
+            return res
+
+
+          end
+        end
+      end
+
+      # Normalize array of attributes
+      # [:col1, "col2", {:name => :col3}] =>
+      #   [{:name => "col1"}, {:name => "col2"}, {:name => "col3"}]
+      def normalize_attrs(attrs)
+        attrs.map{ |a| normalize_attr(a) }
+      end
+
+      # Normalize an attribute, e.g.:
+      # :first_name =>
+      #   {:name => "first_name"}
+      def normalize_attr(a)
+        a.is_a?(Symbol) || a.is_a?(String) ? {:name => a.to_s} : a.merge(:name => a[:name].to_s)
+      end
+
+      # Returns association and association method for a column
+      def assoc_and_assoc_method_for_column(c)
+        assoc_name, assoc_method = c[:name].split('__')
+        assoc = data_class.reflect_on_association(assoc_name.to_sym) if assoc_method
+        [assoc, assoc_method]
+      end
+
+      def association_attr?(name)
+        !!name.to_s.index("__")
+      end
+
+      # Model class
+      def data_class
+        @data_class ||= begin
+          klass = constantize_class_name("Netzke::ModelExtensions::#{config[:model]}For#{short_component_class_name}") || original_data_class
+        end
+      end
+
+      # Model class before model extensions are taken into account
+      def original_data_class
+        @original_data_class ||= begin
+          ::ActiveSupport::Deprecation.warn("data_class_name option is deprecated. Use model instead", caller) if config[:data_class_name]
+          model_name = config[:model] || config[:data_class_name]
+          model_name && constantize_class_name(model_name)
+        end
+      end
+
+      # whether a column is bound to the primary_key
+      def primary_key_attr?(a)
+        data_class && a[:name].to_s == data_class.primary_key
+      end
+
+      # Mark an attribute as "virtual" by default, when it doesn't reflect a model column, or a model column of an association
+      def set_default_virtual(c)
+        if c[:virtual].nil? # sometimes at maybe handy to mark a column as non-virtual forcefully
+          assoc, assoc_method = assoc_and_assoc_method_for_column(c)
+          if assoc
+            c[:virtual] = true if !assoc.klass.column_names.map(&:to_sym).include?(assoc_method.to_sym)
+          else
+            c[:virtual] = true if !data_class.column_names.map(&:to_sym).include?(c[:name].to_sym)
+          end
+        end
+      end
+
+      # An ActiveRecord::Relation instance encapsulating all the necessary conditions.
+      # Using the meta_where magic.
+      def get_relation(params = {})
+        # make params coming from Ext grid filters understandable by meta_where
+        conditions = params[:filter] && convert_filters(params[:filter]) || {}
+
+        relation = data_class.where(conditions)
+
+        if params[:extra_conditions]
+          extra_conditions = normalize_extra_conditions(ActiveSupport::JSON.decode(params[:extra_conditions]))
+          relation = relation.extend_with_netzke_conditions(extra_conditions) if params[:extra_conditions]
+        end
+
+        if params[:query]
+          # array of arrays of conditions that should be joined by OR
+          query = ActiveSupport::JSON.decode(params[:query])
+          meta_where = query.map do |conditions|
+            normalize_and_conditions(conditions)
+          end
+
+          # join them by OR
+          meta_where = meta_where.inject(meta_where.first){ |r,c| r | c } if meta_where.present?
+        end
+
+        relation = relation.where(meta_where)
+
+        relation = relation.extend_with(config[:scope]) if config[:scope]
+
+        relation
+      end
+
+      protected
+
+        def normalize_and_conditions(conditions)
+          and_conditions = conditions.map do |q|
+            value = q["value"]
+            case q["operator"]
+            when "contains"
+              q["attr"].to_sym.matches % %Q{%#{value}%}
+            else
+              if value == false || value == true
+                q["attr"].to_sym.eq % (value ? 1 : 0)
+              else
+                q["attr"].to_sym.send(q["operator"]) % value
+              end
+            end
+          end
+
+          # join them by AND
+          and_conditions.inject(and_conditions.first){ |r,c| r & c } if and_conditions.present?
+        end
+
+    end
+  end
+end

data/lib/netzke/basepack/form_panel.rb

@@ -1,6 +1,5 @@
 require "netzke/basepack/form_panel/fields"
 require "netzke/basepack/form_panel/services"
-require "netzke/data_accessor"
 # require "netzke/plugins/configuration_tool"
 
 module Netzke
@@ -20,6 +19,8 @@ module Netzke
     # The layout of the form is configured by supplying the +item+ config option, same way it would be configured in Ext (thus allowing for complex form layouts). FormPanel will expand fields by looking at their names (unless +no_binding+ set to +true+ is specified for a specific field).
     class FormPanel < Netzke::Base
 
+      js_base_class "Ext.form.FormPanel"
+
       # Class-level configuration
       class_attribute :config_tool_available
       self.config_tool_available = true
@@ -29,38 +30,67 @@ module Netzke
 
       include self::Services
       include self::Fields
-      include Netzke::DataAccessor
-
-      js_base_class "Ext.form.FormPanel"
+      include Netzke::Basepack::DataAccessor
+
+      action :apply do
+        {
+          :text => I18n.t('netzke.basepack.form_panel.actions.apply'),
+          :tooltip => I18n.t('netzke.basepack.form_panel.actions.apply_tooltip'),
+          :icon => :tick
+        }
+      end
 
-      def bbar(config)
-        config[:mode] == :lockable ? nil : [:apply.action]
+      action :edit do
+        {
+          :text => I18n.t('netzke.basepack.form_panel.actions.edit'),
+          :tooltip => I18n.t('netzke.basepack.form_panel.actions.edit_tooltip'),
+          :icon => :pencil
+        }
       end
 
-      action :apply, :text => I18n.t('netzke.basepack.form_panel.apply', :default => "Apply"), :icon => :tick
-      action :edit, :text => I18n.t('netzke.basepack.form_panel.edit', :default => "Edit"), :icon => :pencil
-      action :cancel, :text => I18n.t('netzke.basepack.form_panel.cancel', :default => "Cancel"), :icon => :cancel
+      action :cancel do
+        {
+          :text => I18n.t('netzke.basepack.form_panel.actions.cancel'),
+          :tooltip => I18n.t('netzke.basepack.form_panel.actions.cancel_tooltip'),
+          :icon => :cancel
+        }
+      end
 
       def configuration
-        sup = super
+        super.tap do |sup|
+          configure_locked(sup)
+          configure_bbar(sup)
+        end
+      end
+
+      def configure_locked(c)
+        c[:locked] = c[:locked].nil? ? (c[:mode] == :lockable) : c[:locked]
+      end
 
-        sup.merge(
-          :bbar => sup[:bbar] || bbar(sup),
-          :locked => sup[:locked].nil? ? (sup[:mode] == :lockable) : sup[:locked]
-        )
+      def configure_bbar(c)
+        c[:bbar] = [:apply.action] if c[:bbar].nil?
       end
 
       # Extra javascripts
-      js_mixin :main
+      js_mixin :form_panel
       js_include :comma_list_cbg
-      js_include :n_radio_group, :display_mode
+      js_include :n_radio_group, :display_mode, :readonly_mode
       # Netzke::Base.config[:ext_location] + "/examples/ux/fileuploadfield/FileUploadField.js",
       # "#{File.dirname(__FILE__)}/form_panel/javascripts/netzkefileupload.js"
 
+      # Extra CSS
+      css_include :readonly_mode
+
       def js_config
-        super.merge(
-          :pri    => data_class && data_class.primary_key
-        )
+        super.tap do |res|
+          res[:pri] = data_class && data_class.primary_key
+          res[:record] = js_record_data if record
+        end
+      end
+
+      # A hash of record data including the meta field
+      def js_record_data
+        record.to_hash(fields).merge(:_meta => meta_field).literalize_keys
       end
 
       def record
@@ -101,7 +131,26 @@ module Netzke
         private
 
           def self.server_side_config_options
-            super + [:record]
+            super + [:record, :scope]
+          end
+
+          def meta_field
+            {}.tap do |res|
+              assoc_values = get_association_values
+              res[:association_values] = assoc_values.literalize_keys if record && !assoc_values.empty?
+            end
+          end
+
+          def get_association_values
+            fields_that_need_associated_values = fields.select{ |k,v| k.to_s.index("__") && !fields[k][:nested_attribute] }
+            # Take care of Ruby 1.8.7
+            if fields_that_need_associated_values.is_a?(Array)
+              fields_that_need_associated_values = fields_that_need_associated_values.inject({}){|r,(k,v)| r.merge(k => v)}
+            end
+
+            fields_that_need_associated_values.each_pair.inject({}) do |r,(k,v)|
+              r.merge(k => record.value_for_attribute(fields_that_need_associated_values[k], true))
+            end
           end
 
       # include ::Netzke::Plugins::ConfigurationTool if config_tool_available # it will load ConfigurationPanel into a modal window