@@ -1,4 +1,5 @@ -/*globals SWorks, Ext */ +/*globals Ext, SWorks */ +/*jslint glovar: true, undef: true, nomen: true */ SWorks.CurrentUser = function() { this.permissions = {}; account_menu.js @@ -1,4 +1,5 @@ /*globals Ext */ +/*jslint glovar: true, undef: true, nomen: true */ Ext.ux.JsonTreeNode = function(config) { config = config || {}; bulk_multi_select.js @@ -1,4 +1,5 @@ /*globals Ext */ +/*jslint glovar: true, undef: true, nomen: true */ Ext.namespace('Ext.ux.data'); collection_index.js @@ -1,4 +1,5 @@ -/*globals SWorks, Ext */ +/*globals Ext, SWorks */ +/*jslint glovar: true, undef: true, nomen: true */ // To be included into classes and used there, not to be used // directly. crud_components.js @@ -1,4 +1,5 @@ /*globals Ext, SWorks */ +/*jslint glovar: true, undef: true, nomen: true */ Ext.namespace('SWorks'); crud_editor.js @@ -1,4 +1,5 @@ /*globals Ext, CSRFKiller */ +/*jslint glovar: true, undef: true, nomen: true */ /* * var CSRFKiller = { csrf_killer.js @@ -1,4 +1,5 @@ -/*globals SWorks, Ext */ +/*globals Ext, SWorks */ +/*jslint glovar: true, undef: true, nomen: true */ Ext.override(Ext.form.ComboBox, { getSelected: function() { custom_combo.js @@ -1,4 +1,5 @@ -/*globals SWorks, Ext */ +/*globals Ext, SWorks */ +/*jslint glovar: true, undef: true, nomen: true */ Ext.override(Ext.grid.GridView, { // By default it scrolls to the top custom_grids.js @@ -1,4 +1,5 @@ /*globals Ext */ +/*jslint glovar: true, undef: true, nomen: true */ Ext.namespace('Ext.ux.tree'); data_store_tree.js @@ -1,4 +1,5 @@ -/*globals Ext, SWorks, ds */ +/*globals Ext, SWorks */ +/*jslint glovar: true, undef: true, nomen: true */ Ext.namespace('Ext.ux.data', 'SWorks'); @@ -424,8 +425,6 @@ Ext.ux.data.PersistentFilters.overrides = { } }; -ds = Ext.StoreMgr; - SWorks.CustomGroupingStore = function(config, custom) { // Because we need to hack the constructor a little if (typeof config == 'string') { data_stores.js @@ -1,4 +1,5 @@ /*globals Ext, SWorks */ +/*jslint glovar: true, undef: true, nomen: true */ Ext.namespace('Ext.ux.grid'); dd.js @@ -1,3 +1,6 @@ +/*globals Ext, SWorks, console */ +/*jslint glovar: true, undef: true, nomen: true */ + Ext.namespace('SWorks'); SWorks.ErrorHandling = { error_handling.js @@ -258,7 +258,6 @@ Ext.extend(SWorks.DataModel, Ext.util.Observable, { form.items.each(function(f) { var key = (f.dataIndex || f.name); - form.fields[key]; if (typeof r.data[key] != 'undefined' && r.data[key] != d[key]) { @@ -301,13 +300,27 @@ Ext.extend(SWorks.DataModel, Ext.util.Observable, { form.submitLock = false; }, formFailure: function(form, action) { - if (action.failureType != 'server' && action.failureType != 'client') { - SWorks.ErrorHandling.serverError(action.result); - } else if (action.failureType == 'server' && action.result.errors.base) { - Ext.MessageBox.alert('Save failed', action.result.errors.base); - } else if (action.options.waitMsg !== false) { - Ext.MessageBox.alert('Save failed', - 'Please fix all the boxes highlighted in red.'); + var res = action.result; + + if (action.failureType != 'server' && + action.failureType != 'client' ) { + SWorks.ErrorHandling.serverError(res); + } else { + var displayed = false; + + if (action.failureType == 'server') { + if (res.errors.base) { + Ext.MessageBox.alert('Save failed', res.errors.base); + displayed = true; + } else if (action.form.displayHiddenErrors(res.errors)) { + displayed = true; + } + } + + if (!displayed && action.options.waitMsg !== false) { + Ext.MessageBox.alert('Save failed', + 'Please fix all the boxes highlighted in red.'); + } } // Ext will display our validation errors from JsonController. @@ -638,9 +651,9 @@ Ext.extend(SWorks.URLLoadingDataModel, SWorks.StoreDataModel, { }, loadSearchStoreFromRecord: function(record) { - this.store.addFilter('data_model_fk', this.foreignKey+':'+record.data[this.parentKey]) + this.store.addFilter('data_model_fk', this.foreignKey+':'+record.data[this.parentKey]); if (this.foreignTypeKey) { - this.store.addFilter('data_model_polymorphic', this.foreignTypeKey+':'+record.getKlass()) + this.store.addFilter('data_model_polymorphic', this.foreignTypeKey+':'+record.getKlass()); } } }); @@ -650,7 +663,7 @@ SWorks.FerretSearchDataModel = function(overrides) { this.store.baseParams = this.store.baseParams || {}; this.store.baseParams.limit = this.pageSize; -} +}; Ext.extend(SWorks.FerretSearchDataModel, SWorks.StoreDataModel, { updateRecord: function(record, result) { // We don't want the normal StoreDataModel behavior, which is to add the mvc_data_models.js a4d11ff795a7ea70f1daab7e57e6fe6ae13026a0 unknown Jordan@.(none) http://github.com/curzonj/ext-extensions/commit/61dc6d54b90b0eee323dca240ca56ea88bfe330d 61dc6d54b90b0eee323dca240ca56ea88bfe330d 2008-07-02T07:42:47-07:00 2008-07-02T07:42:47-07:00 'wip' a7fed4b43fb9875f8ef74cb199b1cf36328bda4e unknown Jordan@.(none)