netzke-basepack 0.6.4 → 0.6.5

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+= v0.6.5 - 2011-08-16
+* changes
+  * Replaced tri-state checkbox with combobox in the multi-edit form and search form
+* enhancements
+  * When columns states are saved in the persistent storage, adding/removing columns (e.g. in the code) will reset the saved states
+  * Moved features and specs to test/rails_app
+* bug fix
+  * FormPanel with multiple association fields wouldn't submit data correctly
+  * Fixed an old bug where tri-checkbox set to 'unchecked' had no effect in multi-edit
+
 = v0.6.4 - 2011-02-26
 * API changes
   * The combo field able to talk to the server has changed its xtype from combobox to netzkeremotecombo. When getting values from the server via AJAX, it expects a 2-dimensional array now, where the first value is the real value (which gets submitted), and the second value is the display value.

data/README.rdoc

@@ -35,7 +35,7 @@ For more examples, see http://demo.netzke.com, and look into test/rails_app
 
 Netzke-basepack is bundled with automated tests. To run them, you need to set up test/rails_app a similar way as you did with your own Rails app that is using Netzke, i.e.: 1) link Ext JS into the "public" folder, 2) link your copy of netzke-core and netzke-basepack into vendor/gems, 3) run migrations and clone the development database structure into the test database.
 
-After this you may run (*from the netzke-basepack folder*):
+After this you may run (*from test/rails_app*):
 
     cucumber features
 

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gemspec.email = "sergei@playcode.nl"
     gemspec.homepage = "http://netzke.org"
     gemspec.authors = ["Sergei Kozlov"]
-    gemspec.add_dependency("netzke-core", "~>0.6.4")
+    gemspec.add_dependency("netzke-core", "~>0.6.7")
     gemspec.add_dependency("meta_where", ">=0.9.3")
     gemspec.add_dependency("will_paginate", "~>3.0.pre2")
     gemspec.add_dependency("acts_as_list")

data/javascripts/basepack.js

@@ -108,114 +108,10 @@ Ext.grid.HeaderDropZone.prototype.onNodeDrop = function(n, dd, e, data){
 
 
 Ext.ns('Ext.ux.form');
-Ext.ux.form.TriCheckbox = Ext.extend(Ext.form.Checkbox, {
-  checked: null,
-  valueList: [null, false, true],
-  stateClassList: ['x-checkbox-undef', null, 'x-checkbox-checked'],
-  overClass: 'x-form-check-over',
-  clickClass: 'x-form-check-down',
-  triState: true,
-  defaultAutoCreate: {tag: 'input', type: 'hidden', autocomplete: 'off'},
-  initComponent: function() {
-    this.value = this.checked;
-    Ext.ux.form.TriCheckbox.superclass.initComponent.apply(this, arguments);
-    // make a copy before modifying valueList and stateClassList arrays
-    this.vList = this.valueList.slice(0);
-    this.cList = this.stateClassList.slice(0);
-    if(this.triState !== true) {
-      // consider 'undefined' value and its class go first in arrays
-      this.vList.shift();
-      this.cList.shift();
-    }
-    if(this.overCls !== undefined) {
-      this.overClass = this.overCls;
-      delete this.overCls;
-    }
-    this.value = this.normalizeValue(this.value);
-  },
-  onRender : function(ct, position){
-    Ext.form.Checkbox.superclass.onRender.call(this, ct, position);
-
-    this.innerWrap = this.el.wrap({tag: 'span', cls: 'x-form-check-innerwrap'});
-    this.wrap = this.innerWrap.wrap({cls: 'x-form-check-wrap'});
-
-    this.currCls = this.getCls(this.value);
-    this.wrap.addClass(this.currCls);
-    if(this.clickClass && !this.disabled && !this.readOnly)
-      this.innerWrap.addClassOnClick(this.clickClass);
-    if(this.overClass && !this.disabled && !this.readOnly)
-      this.innerWrap.addClassOnOver(this.overClass);
-
-    this.imageEl = this.innerWrap.createChild({
-      tag: 'img',
-      src: Ext.BLANK_IMAGE_URL,
-      cls: 'x-form-tscheckbox'
-    }, this.el);
-    if(this.fieldClass) this.imageEl.addClass(this.fieldClass);
-
-    if(this.boxLabel){
-      this.innerWrap.createChild({
-        tag: 'label',
-        htmlFor: this.el.id,
-        cls: 'x-form-cb-label',
-        html: this.boxLabel
-      });
-    }
-
-    // Need to repaint for IE, otherwise positioning is broken
-    if(Ext.isIE){
-      this.wrap.repaint();
-    }
-    this.resizeEl = this.positionEl = this.wrap;
-  },
-  onResize : function(){
-    Ext.form.Checkbox.superclass.onResize.apply(this, arguments);
-    if(!this.boxLabel && !this.fieldLabel && this.imageEl){
-      this.imageEl.alignTo(this.wrap, 'c-c');
-    }
-  },
-  initEvents : function(){
-    Ext.form.Checkbox.superclass.initEvents.call(this);
-    this.mon(this.innerWrap, {
-      scope: this,
-      click: this.onClick
-    });
-  },
-  onClick : function(){
-    if (!this.disabled && !this.readOnly) {
-      this.setValue(this.vList[(this.vList.indexOf(this.value) + 1) % this.vList.length]);
-    }
-  },
-  getValue : function(){
-    return this.value;
-  },
-  setValue : function(v){
-    var value = this.value;
-    this.value = this.normalizeValue(v);
-    if(this.rendered) this.el.dom.value = this.value;
-
-    if(value !== this.value){
-      this.updateView();
-      this.fireEvent('check', this, this.value);
-      if(this.handler) this.handler.call(this.scope || this, this, this.value);
-    }
-    return this;
-  },
-  normalizeValue: function(v) {
-    return (v === null || v === undefined) && this.triState ? null :
-      (v === true || (['true', 'yes', 'on', '1']).indexOf(String(v).toLowerCase()) != -1);
-  },
-  getCls: function(v) {
-    var idx = this.vList.indexOf(this.value);
-    return idx > -1 ? this.cList[idx] : undefined;
-  },
-  updateView: function() {
-    var cls = this.getCls(this.value);
-    if (!this.wrap || cls === undefined) return;
-
-    this.wrap.replaceClass(this.currCls, cls);
-    this.currCls = cls;
-  }
+Ext.ux.form.TriCheckbox = Ext.extend(Ext.form.ComboBox, {
+  store: [[true, "true"], [false, "false"]],
+  forceSelection: true,
+  triggerAction: 'all'
 });
 Ext.reg('tricheckbox', Ext.ux.form.TriCheckbox);
 

data/javascripts/feedback_ghost.js

@@ -0,0 +1,34 @@
+// Feedback Ghost
+Netzke.FeedbackGhost = function(){};
+Ext.apply(Netzke.FeedbackGhost.prototype, {
+  showFeedback: function(msg){
+    var createBox = function(s, l){
+        return ['<div class="msg">',
+                '<div class="x-box-tl"><div class="x-box-tr"><div class="x-box-tc"></div></div></div>',
+                '<div class="x-box-ml"><div class="x-box-mr"><div class="x-box-mc">', s, '</div></div></div>',
+                '<div class="x-box-bl"><div class="x-box-br"><div class="x-box-bc"></div></div></div>',
+                '</div>'].join('');
+    }
+
+    var showBox = function(msg, lvl){
+      if (!lvl) {lvl = 'notice'};
+
+      var msgCt = Ext.get('netzke-feedback') || Ext.DomHelper.insertFirst(document.body, {id: 'netzke-feedback', 'class':'netzke-feedback'}, true);
+
+      var m = Ext.DomHelper.append(msgCt, {html:createBox(msg,lvl)}, true);
+      m.slideIn('t').pause(2).ghost("b", {remove:true});
+    }
+
+    if (typeof msg != 'string') {
+      var compoundMsg = "";
+      Ext.each(msg, function(m){
+        compoundMsg += m.msg + '<br>';
+      });
+      if (compoundMsg != "") showBox(compoundMsg, null); // the second parameter will be level
+    } else {
+      showBox(msg);
+    }
+  }
+});
+
+Netzke.componentMixin.feedbackGhost = new Netzke.FeedbackGhost();

data/lib/netzke/basepack.rb

@@ -11,6 +11,7 @@ module Netzke
 
       # Called from netzke-basepack.rb
       def init
+        Netzke::Core.ext_javascripts << "#{File.dirname(__FILE__)}/../../javascripts/feedback_ghost.js"
         Netzke::Core.ext_javascripts << "#{File.dirname(__FILE__)}/../../javascripts/datetimefield.js"
         Netzke::Core.ext_javascripts << "#{File.dirname(__FILE__)}/../../javascripts/basepack.js"
 

data/lib/netzke/basepack/form_panel.rb

@@ -71,16 +71,17 @@ module Netzke
         c[:bbar] = [:apply.action] if c[:bbar].nil?
       end
 
-      # Extra javascripts
+      # Extra JavaScripts and stylesheets
       js_mixin :form_panel
       js_include :comma_list_cbg
-      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
+      js_include :n_radio_group, :readonly_mode
       css_include :readonly_mode
 
+      js_include Netzke::Core.ext_location.join("examples/ux/fileuploadfield/FileUploadField.js")
+      css_include Netzke::Core.ext_location.join("examples/ux/fileuploadfield/css/fileuploadfield.css")
+
+      js_include :misc
+
       def js_config
         super.tap do |res|
           res[:pri] = data_class && data_class.primary_key

data/lib/netzke/basepack/form_panel/fields.rb

@@ -98,11 +98,8 @@ module Netzke
             detect_association_with_method(field) # xtype for an association field
             set_default_field_label(field)
             set_default_field_xtype(field) if field[:xtype].nil?
-            # set_default_field_value(field) if self.record
             set_default_read_only(field)
 
-            field[:display_mode] = config[:display_mode] if config[:display_mode]
-
             # provide our special combobox with our id
             field[:parent_id] = self.global_id if field[:xtype] == :netzkeremotecombo
 
@@ -153,17 +150,6 @@ module Netzke
             item.is_a?(String) || item.is_a?(Symbol) || item[:name] # && !is_component_config?(item)
           end
 
-          def set_default_field_label(c)
-            # multiple spaces (in case of association attrs) get replaced with one
-            c[:field_label] ||= data_class ? data_class.human_attribute_name(c[:name]) : c[:name].humanize
-            c[:field_label].gsub!(/\s+/, " ")
-          end
-
-          # def set_default_field_value(field)
-          #   value = record.value_for_attribute(field)
-          #   field[:value] ||= value unless value.nil?
-          # end
-
           # Deeply merges only those key/values at the top level that are already there
           def deep_merge_existing_fields(dest, src)
             dest.each_pair do |k,v|
@@ -171,6 +157,12 @@ module Netzke
             end
           end
 
+          def set_default_field_label(c)
+            # multiple spaces (in case of association attrs) get replaced with one
+            c[:field_label] ||= data_class ? data_class.human_attribute_name(c[:name]) : c[:name].humanize
+            c[:field_label].gsub!(/\s+/, " ")
+          end
+
           def set_default_field_xtype(field)
             field[:xtype] = xtype_for_attr_type(field[:attr_type]) unless xtype_for_attr_type(field[:attr_type]).nil?
           end

data/lib/netzke/basepack/form_panel/javascripts/form_panel.js

@@ -19,6 +19,19 @@
   initComponent: function(){
     if (!this.bbar) this.bbar = {xtype: 'toolbar'}; // an empty bbar by default, so that we can dynamically add buttons
 
+    // Custom error reader. We don't use it to process form values, but rather to normalize the response from the server in case of "real" (iframe) form submit.
+    ErrorReader = function(){};
+
+    ErrorReader.prototype.read = function(xhr) {
+      var unescapeHTML = function(str) {
+        return str.replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&amp;/g,'&');
+      }
+      xhr.responseText = unescapeHTML(xhr.responseText.replace(/<pre.*?>/, "").replace("</pre>", ""));
+      return {records: [], success: true};
+    };
+
+    this.initialConfig.errorReader = new ErrorReader();
+
     // Now let Ext.form.FormPanel do the rest
     Netzke.classes.Basepack.FormPanel.superclass.initComponent.call(this);
 
@@ -73,40 +86,63 @@
     tbar.doLayout();
   },
 
-
   onApply: function() {
     if (this.fireEvent('apply', this)) {
       var values = this.getForm().getFieldValues();
 
-      // do not send values from disabled fields and empty values
       for (var fieldName in values) {
         var field = this.getForm().findField(fieldName);
+
+        // TODO: move the following checks to the server side (through the :display_only option)
+
+        // do not submit values from disabled fields
         if (!field || field.disabled) delete values[fieldName];
+
+        // do not submit values from read-only association fields
+        if (field
+          && field.name.indexOf("__") !== -1
+          && (field.readOnly || !field.getStore)
+          && (!field.nestedAttribute) // except for "nested attributes"
+        ) delete values[fieldName];
+
+        // do not submit values from displayfields
+        if (field.isXType('displayfield')) delete values[fieldName];
+
+        // do not submit displayOnly fields
+        if (field.displayOnly) delete values[fieldName];
       }
 
+      // apply mask
       if (!this.applyMaskCmp) this.applyMaskCmp = new Ext.LoadMask(this.bwrap, this.applyMask);
-
       this.applyMaskCmp.show();
 
+      // We must use a different approach when the form is multipart, as we can't use the endpoint
       if (this.fileUpload) {
-        // Not a Netzke's standard endpoint call, because the form is multipart
-        this.getForm().submit({
-          api: {submit: Netzke.providers[this.parentId].netzkeSubmit},
+        this.getForm().submit({ // normal submit
+          url: this.endpointUrl("netzke_submit"),
           params: {
-            data: Ext.encode(values)
+            data: Ext.encode(values) // here are the correct values that may be different from display values
           },
           failure: function(form, action){
-            // It will always be failure, as we don't play along with the Ext success indication (not returning {success: true})
-            this.bulkExecute(Ext.decode(action.response.responseText));
-            this.fireEvent('submitsuccess');
+            if (this.applyMaskCmp) this.applyMaskCmp.hide();
+          },
+          success: function(form, action) {
+            try {
+              var respObj = Ext.decode(action.response.responseText);
+              delete respObj.success;
+              this.bulkExecute(respObj);
+              this.fireEvent('submitsuccess');
+            }
+            catch(e) {
+              Ext.Msg.alert('File upload error', action.response.responseText);
+            }
             if (this.applyMaskCmp) this.applyMaskCmp.hide();
           },
           scope: this
         });
       } else {
-        // Submit the data and process the result
-        this.netzkeSubmit(Ext.apply((this.baseParams || {}), {data:Ext.encode(values)}), function(result){
-          if (result === "ok") {
+        this.netzkeSubmit(Ext.apply((this.baseParams || {}), {data:Ext.encode(values)}), function(success){
+          if (success) {
             this.fireEvent("submitsuccess");
             if (this.mode == "lockable") this.setReadonlyMode(true);
           };
@@ -120,28 +156,18 @@
     var assocValues = values._meta.associationValues || {};
     for (var assocFieldName in assocValues) {
       var assocField = this.find('name', assocFieldName)[0];
-      if (this.inDisplayMode) {
-        assocField.origValue = values[assocFieldName];
-        assocField.setValue(assocValues[assocFieldName]);
-        delete values[assocFieldName]; // we don't want this to be set once more below with setValues()
-      } else {
+      if (assocField.getStore) {
         assocField.getStore().loadData({data: [[values[assocFieldName], assocValues[assocFieldName]]]});
         delete assocField.lastQuery; // force loading the store next time user clicks the trigger
+      } else {
+        assocField.setValue(assocValues[assocFieldName]);
+        delete values[assocFieldName]; // we don't want this to be set once more below with setValues()
       }
     }
 
     this.getForm().setValues(values);
   },
 
-  setDisplayMode: function(onOff, cancel){
-    if (this.inDisplayMode == onOff) return;
-    this.getForm().items.each(function(i){i.setDisplayMode(onOff);});
-    this.getForm().cleanDestroyed(); // because fields inside of composite fields are not auto-cleaned!
-    this.doLayout();
-    this.inDisplayMode = onOff;
-    this.updateToolbar();
-  },
-
   setReadonlyMode: function(onOff, cancel){
     if (this.inReadonlyMode == onOff) return;
     this.getForm().items.each(function(i){i.setReadonlyMode(onOff);});

data/lib/netzke/basepack/form_panel/javascripts/misc.js

@@ -0,0 +1,4 @@
+Ext.override(Ext.ux.form.FileUploadField, {
+  // FormPanel won't submit this by default
+  displayOnly: true
+});

data/lib/netzke/basepack/form_panel/javascripts/readonly_mode.js

@@ -4,7 +4,9 @@ Ext.override(Ext.form.Field, {
   setReadonlyMode: function(onOff){
     if (this.hidden) return;
 
-    this.setReadOnly(onOff);
+    if (!this.initialConfig.readOnly) {
+      this.setReadOnly(onOff);
+    }
 
     if (onOff) {
       this.addClass("readonly");
@@ -13,26 +15,7 @@ Ext.override(Ext.form.Field, {
       this.removeClass("readonly");
       if (this.label) this.label.removeClass("readonly");
     }
-    // var owner = this.ownerCt;
-    // var newConfig = this.readonlyModeConfig(onOff);
-    //
-    // var idx = this.removeSelf();
-    // owner.insert(idx, newConfig);
-    //
-    // this.destroy();
-  },
-
-  // Remove self from the container
-  // removeSelf: function(){
-  //   var idx = this.ownerCt.items.indexOf(this);
-  //   this.ownerCt.remove(this);
-  //   return idx;
-  // },
-
-  // Config for creating an instance in "displayMode" (if onOff is true), or normal mode (if onOff is false)
-  // displayModeConfig: function(onOff){
-  //   return Ext.apply(this.initialConfig, onOff ? {xtype: 'displayfield', origXtype: this.xtype, value: this.getValue()} : {xtype: this.origXtype, value: this.getValue()});
-  // }
+  }
 
 });
 

data/lib/netzke/basepack/form_panel/services.rb

@@ -9,7 +9,7 @@ module Netzke
           #
           # Endpoints
           #
-          endpoint :netzke_submit do |params|
+          endpoint :netzke_submit, :pre => true do |params|
             netzke_submit(params)
           end
 
@@ -48,16 +48,23 @@ module Netzke
         # Implementation for the "netzke_submit" endpoint (for backward compatibility)
         def netzke_submit(params)
           data = ActiveSupport::JSON.decode(params[:data])
+
+          # File uploads are in raw params instead of "data" hash, so, mix them in into "data"
+          if config[:file_upload]
+            Netzke::Core.controller.params.each_pair do |k,v|
+              data[k] = v if v.is_a?(ActionDispatch::Http::UploadedFile)
+            end
+          end
+
           success = create_or_update_record(data)
 
           if success
-            {:set_form_values => js_record_data, :set_result => "ok"}
+            {:set_form_values => js_record_data, :set_result => true}
           else
             # flash eventual errors
             @record.errors.to_a.each do |msg|
               flash :error => msg
             end
-            # {:feedback => @flash}
             {:feedback => @flash, :apply_form_errors => build_form_errors(record)}
           end
         end