spiderfw 0.5.7 → 0.5.9

data/apps/core/components/public/js/jquery/plugins/jquery.form.js

@@ -54,11 +54,11 @@ $.fn.ajaxSubmit = function(options) {
 		options = { success: options };
 
 	var url = $.trim(this.attr('action'));
+	url = url || window.location.href || '';
 	if (url) {
 		// clean url (don't include hash vaue)
 		url = (url.match(/^([^#]+)/)||[])[1];
    	}
-   	url = url || window.location.href || '';
 
 	options = $.extend({
 		url:  url,

data/apps/core/components/public/js/spider.js

@@ -97,23 +97,7 @@ Spider.Widget = Class.extend({
 		el.each(function(){
 			var $this = $(this);
 			if (this.tagName == 'FORM'){
-				$('input[type=submit]', $this).click(function(e){
-					e.preventDefault();
-					w.setLoading();
-					var submitName = $(this).attr('name');
-					var submitValue = $(this).val();
-					$this.ajaxSubmit({
-						dataType: 'html',
-						beforeSubmit: function(data, form, options){
-							data.push({name: submitName, value: submitValue});
-							data.push({name: '_wt', value: w.path});
-						},
-						success: function(res){
-							w.replaceHTML(res);
-							w.removeLoading();
-						}
-					});
-				});
+				w.ajaxifyForm($(this));
 			}
 			else if (this.tagName == 'A'){
 				$this.click(function(e){
@@ -145,6 +129,29 @@ Spider.Widget = Class.extend({
 
 	},
 	
+	ajaxifyForm: function(form){
+		var w = this;
+		var isForm = form.get(0).tagName == 'FORM';
+		$('input[type=submit]', form).click(function(e){
+			e.preventDefault();
+			w.setLoading();
+			var submitName = $(this).attr('name');
+			var submitValue = $(this).val();
+			form.ajaxSubmit({
+				dataType: 'html',
+				semantic: !isForm,
+				beforeSubmit: function(data, form, options){
+					data.push({name: submitName, value: submitValue});
+					data.push({name: '_wt', value: w.path});
+				},
+				success: function(res){
+					w.replaceHTML(res);
+					w.removeLoading();
+				}
+			});
+		});
+	},
+	
 	setLoading: function(){
 		if (this.el.is(':empty')){
 			this.el.addClass('loading-empty');
@@ -217,7 +224,7 @@ Spider.Widget.initFromEl = function(el){
     var path = Spider.Widget.pathFromId(el.attr('id'));
 	if (Spider.widgets[path]){
 		var widget = Spider.widgets[path];
-		widget.replaceEl(el);
+		if (el.get(0) != widget.el.get(0)) widget.replaceEl(el);
 		return widget;
 	} 
     var cl = el.attr('class');
@@ -257,9 +264,8 @@ Spider.WidgetBackend = Class.extend({
 
 	init: function(widget){
 		this.widget = widget;
-		this.baseUrl = document.location.href;
+		this.baseUrl = document.location.href.split('#')[0];
 		this.urlParts = this.baseUrl.split('?');
-		this.urlParts[0] = this.urlParts[0].split('#')[0];
 		this.wUrl = this.urlParts[0]+'?';
 		if (this.urlParts[1]) this.wUrl += this.urlParts[1]+'&';
 		this.wUrl += '_wt='+this.widget.path;

data/apps/core/components/widgets/admin/admin.rb

@@ -18,7 +18,7 @@ module Spider; module Components
         tag 'admin'
         
         i_attribute :models, :process => lambda{ |models| models.split(/,[\s\n]*/).map{|m| const_get_full(m) } }
-        is_attr_accessor :title, :default => _("Administration")
+        is_attr_accessor :title, :default => lambda{ _("Administration") }
         is_attr_accessor :logout_url, :default => Spider::Auth.request_url+'/login/logout'
         
         def init

data/apps/core/components/widgets/crud/crud.rb

@@ -104,7 +104,7 @@ module Spider; module Components
                 links = {}
                 table_rows = @widgets[:table].scene.data
                 table_rows.each_index do |i|
-                    links[i] = "#{widget_request_path}/#{table_rows[i][@key_element]}"
+                    links[i] = "#{widget_request_path}/#{Spider::HTTP.urlencode(table_rows[i][@key_element])}"
                 end
                 @widgets[:table].scene.links_to_form = links
             end

data/apps/core/components/widgets/list/list.rb

@@ -170,7 +170,7 @@ module Spider; module Components
         end
         
         def create_requested_sublist(sbl, row, cnt)
-            attributes = sbl.attributes.clone
+            attributes = sbl.attributes.to_hash.clone
             if (attributes['element'])
                 el = @model.elements[attributes['element'].to_sym]
                 #next unless el # may be ok if the query is polymorphic
@@ -228,7 +228,7 @@ module Spider; module Components
 
         def parse_runtime_content(doc, src_path='')
             doc = super
-            return doc if doc.children.empty?
+            return doc if !doc.children || doc.children.empty?
             doc.root.children_of_type('sublist').each do |sl|
                 raise ArgumentError, "Sublist of #{@id} does not have an id" unless sl['id']
                 @requested_sublists ||= []

data/apps/core/components/widgets/month_calendar/month_calendar.rb

@@ -0,0 +1,67 @@
+module Spider; module Components
+    
+    class MonthCalendar < Spider::Widget
+        tag 'month_calendar'
+        
+        attribute :start_month, :type => Fixnum
+        attribute :start_year, :type => Fixnum
+        attr_accessor :busy
+        
+        def prepare
+            super
+            today = Date.today
+            start_month = attributes[:start_month] || today.month
+            start_year = attributes[:start_year] || today.year
+            if params['d'] && params['d'] =~ /(\d{4})\/(\d{1,2})/
+                @month = $2.to_i
+                @year = $1.to_i
+            else
+                @month = start_month
+                @year = start_year
+            end
+            @busy ||= {}
+        end
+        
+        def run
+            month = @month; year = @year
+            @scene.month = month
+            @scene.year = year
+            @scene.first_week_day = Spider.i18n.week_start
+            @scene.weekend_start = Spider.i18n.weekend_start
+            @scene.weekend_end = Spider.i18n.weekend_end
+            @scene.days_short_names = Spider.i18n.day_names(:narrow)
+            @scene.week_days = (0..6).map{ |i| (@scene.first_week_day + i) % 7 }
+            @scene.current_month_name = Spider.i18n.month_names[month]
+            @scene.first_day = Date.civil(year, month, 1)
+            @scene.first_day_wday = @scene.first_day.wday
+            @scene.last_day = Date.civil(year, month, -1)
+            @scene.days_in_month = @scene.last_day.day
+            @scene.last_day_wday = @scene.last_day.wday
+            @scene.prev_month = (@scene.first_day - 1)
+            @scene.prev_month_last_day = @scene.prev_month.day
+            @scene.next_month = (@scene.first_day + 31)
+            @scene.prev_link = "#{@scene.prev_month.year}/#{@scene.prev_month.month}"
+            @scene.next_link = "#{@scene.next_month.year}/#{@scene.next_month.month}"
+            @scene.rows = [[]]
+            row = 0
+            col = ((@scene.first_day_wday - @scene.first_week_day) % 7) - 1
+            0.upto(col){ |i| @scene.rows[0][i] = {:day => @scene.prev_month_last_day - col + i, :classes => ['prev-month'] } }
+            1.upto(@scene.days_in_month) do |i|
+                col += 1
+                if (col == 7)
+                    col = 0
+                    row += 1
+                    @scene.rows[row] = []
+                end
+                classes = []
+                classes << 'busy' if @busy[year] && @busy[year][month] && @busy[year][month][i]
+                @scene.rows[row][col] = {:day => i, :classes => classes}
+            end
+            (col+1).upto(6){ |i| @scene.rows[row][i] = {:day => i - col, :classes => ['next-month'] } }
+        end
+        
+        
+        
+    end
+    
+end; end

data/apps/core/components/widgets/month_calendar/month_calendar.shtml

@@ -0,0 +1,21 @@
+<table class="{ @widget[:css_class] }">
+    <tpl:asset type="css" src="css/month_calendar.css" />
+    <thead>
+        <tr>
+            <th colspan="7">
+                <a href="{ @request[:path] }?_w{ @widget[:param] }[d]={ @prev_link }"><span>&lt;&lt;</span></a>
+                { @current_month_name } { @year }
+                <a href="{ @request[:path] }?_w{ @widget[:param] }[d]={ @next_link }"><span>&gt;&gt;</span></a>
+            </th>
+        <tr>
+            <th sp:each="@week_days |i|">{ @days_short_names[i] }</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr sp:each="@rows |row|">
+            <td sp:each="row |col|" class="{ col[:classes] }">
+                { col[:day] }
+            </td>
+        </tr>
+    </tbody>
+</table>

data/apps/core/components/widgets/table/table.rb

@@ -125,8 +125,10 @@ module Spider; module Components
                     else
                         if (!row[el])
                             res_row[el] = '' 
-                        elsif (element.type < Date || element.type < Time)
-                            res_row[el] = Spider::I18n.localize(@request.locale, row[el])
+                        elsif (element.type <= Date || element.type <= Time)
+                            res_row[el] = Spider::I18n.localize_date_time(@request.locale, row[el], :short)
+                        elsif (element.type <= Float || element.type <= BigDecimal)
+                            res_row[el] = Spider::I18n.localize_number(@request.locale, row[el])
                         elsif (row[el].respond_to?(:format))
                             res_row[el] = row[el].format(:short)
                         else                            

data/apps/core/components/widgets/table/table.shtml

@@ -5,37 +5,43 @@
         Nessun elemento
     </div>
     <table sp:if="@rows && @rows.length > 0" class="{ @widget[:css_class] }">
-        <tr class="heading_row">
-            <th sp:each="@elements |element|">
-                <a sp:tag-if="@sortable[element]" href="{ @request[:path] }?_w{ @widget[:param] }[sort]={ element }">
-                    { @labels[element] }
-                </a>
-            </th>
-        </tr>
-        <tr sp:each_index="@rows |row_i|" class="row { (row_i%2==0) ? 'odd' : 'even' }">
-            <td sp:each="@elements |element|">
-                <a sp:tag-if="@link_el && element == @link_el" href="{ @link }{ @rows[row_i][element] }">
-                    { @rows[row_i][element] }
-                </a>
-            </td>
-        </tr>
-        <tr class="paginator" sp:if="@paginate && @pages > 1">
-            <td colspan="{ @elements.size }" >
-                <a sp:if="@page > 1" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page-1 }">Indietro</a>
-                <sp:pass sp:if="@paginate_first > 1">
-                    <a href="{ @request[:path] }?_w{ @widget[:param] }[page]=1" class="page">1</a> ... 
-                </sp:pass>
-                <sp:pass sp:each="(@paginate_first..@paginate_last) |i|" >
-                    <a sp:if="i != @page" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ i }" class="page">
-                        { i }
+        <thead>
+            <tr class="heading_row">
+                <th sp:each="@elements |element|">
+                    <a sp:tag-if="@sortable[element]" href="{ @request[:path] }?_w{ @widget[:param] }[sort]={ element }">
+                        { @labels[element] }
                     </a>
-                    <span sp:if="i == @page" class="current">{ i }</span>
-                </sp:pass>
-                <sp:pass sp:if="@paginate_last < @pages-1">
-                    ... <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @pages }" class="page">{ @pages }</a> 
-                </sp:pass>
-                <a sp:if="@has_more" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page+1 }">Avanti</a>
-            </td>
-        </tr>
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr sp:each_index="@rows |row_i|" class="row { (row_i%2==0) ? 'odd' : 'even' }">
+                <td sp:each="@elements |element|">
+                    <a sp:tag-if="@link_el && element == @link_el" href="{ @link }{ Spider::HTTP.urlencode(@rows[row_i][element]) }">
+                        { @rows[row_i][element] }
+                    </a>
+                </td>
+            </tr>
+        </tbody>
+        <tfoot>
+            <tr class="paginator" sp:if="@paginate && @pages > 1">
+                <td colspan="{ @elements.size }" >
+                    <a sp:if="@page > 1" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page-1 }">Indietro</a>
+                    <sp:pass sp:if="@paginate_first > 1">
+                        <a href="{ @request[:path] }?_w{ @widget[:param] }[page]=1" class="page">1</a> ... 
+                    </sp:pass>
+                    <sp:pass sp:each="(@paginate_first..@paginate_last) |i|" >
+                        <a sp:if="i != @page" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ i }" class="page">
+                            { i }
+                        </a>
+                        <span sp:if="i == @page" class="current">{ i }</span>
+                    </sp:pass>
+                    <sp:pass sp:if="@paginate_last < @pages-1">
+                        ... <a href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @pages }" class="page">{ @pages }</a> 
+                    </sp:pass>
+                    <a sp:if="@has_more" href="{ @request[:path] }?_w{ @widget[:param] }[page]={ @page+1 }">Avanti</a>
+                </td>
+            </tr>
+        </tfoot>
     </table>
 </div>

data/apps/core/forms/_init.rb

@@ -19,4 +19,5 @@ require 'apps/core/forms/widgets/inputs/date_time/date_time'
 require 'apps/core/forms/widgets/inputs/select/select'
 require 'apps/core/forms/widgets/inputs/search_select/search_select'
 require 'apps/core/forms/widgets/inputs/password/password'
-require 'apps/core/forms/widgets/inputs/checkbox/checkbox'
+require 'apps/core/forms/widgets/inputs/checkbox/checkbox'
+require 'apps/core/forms/widgets/inputs/file_input/file_input'

data/apps/core/forms/po/it/spider_forms.po

@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Forms 0.1\n"
-"POT-Creation-Date: 2009-10-27 14:38+0100\n"
-"PO-Revision-Date: 2009-10-07 19:35+0100\n"
+"POT-Creation-Date: 2010-04-22 18:59+0200\n"
+"PO-Revision-Date: 2010-03-11 11:36+0100\n"
 "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,3 +34,15 @@ msgstr "%s e rimani"
 #: widgets/inputs/date_time/date_time.rb:17
 msgid "%s is not a valid date"
 msgstr "%s non è una data valida"
+
+#: widgets/inputs/input/input.rb:94
+msgid "%s is required"
+msgstr "Il campo %s è obbligatorio"
+
+#: widgets/inputs/file_input/file_input.shtml:6
+msgid "Clear"
+msgstr "Pulisci"
+
+#: widgets/inputs/file_input/file_input.shtml:8
+msgid "Change"
+msgstr "Cambia"

data/apps/core/forms/po/spider_forms.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Forms 0.1\n"
-"POT-Creation-Date: 2009-10-27 14:38+0100\n"
+"POT-Creation-Date: 2010-04-22 18:59+0200\n"
 "PO-Revision-Date: 2009-06-30 17:03+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,3 +35,15 @@ msgstr ""
 #: widgets/inputs/date_time/date_time.rb:17
 msgid "%s is not a valid date"
 msgstr ""
+
+#: widgets/inputs/input/input.rb:94
+msgid "%s is required"
+msgstr ""
+
+#: widgets/inputs/file_input/file_input.shtml:6
+msgid "Clear"
+msgstr ""
+
+#: widgets/inputs/file_input/file_input.shtml:8
+msgid "Change"
+msgstr ""

data/apps/core/forms/public/css/file_input.css

@@ -0,0 +1,15 @@
+.wdgt-Spider-Forms-FileInput .change{
+	margin: 5px 0;
+}
+
+.wdgt-Spider-Forms-FileInput .js-change-link{
+	margin-left: 10px;
+}
+
+.wdgt-Spider-Forms-FileInput .js-change-link.open{
+	color: #AAAAFF;
+}
+
+.wdgt-Spider-Forms-FileInput .file-link.deleted{
+	text-decoration: line-through;
+}

data/apps/core/forms/public/{form.css → css/form.css}

@@ -8,17 +8,25 @@
     list-style-position:outside;
 }
 
+
+
 .spider.forms.form .fields{
     padding: 10px;
     margin: 20px;
 }
 
 .spider.forms.form label{
+	position: relative;
     display: block;
     float: left;
     width: 8em;
 }
 
+.spider.forms.form label .form_required_symbol{
+	position: absolute;
+	right: 8px;
+}
+
 .spider.forms.form .row.error label{
     padding-left: 4px;
 }

data/apps/core/forms/public/file_input.js

@@ -0,0 +1,37 @@
+Spider.defineWidget('Spider.Forms.FileInput', 'Spider.Forms.Input', {
+	
+	autoInit: true,
+	
+	ready: function(){
+		var self = this;
+		var fileLink = $('.file-link', this.el);
+		if (fileLink.size() == 1){
+			var changeLabel = $('.change-label', this.el).text();
+			var changeDiv = $('.change', this.el);
+			changeDiv.hide();
+			$('.clear', this.el).hide();
+			var clearCheckBox = $('.clear input:checkbox', this.el);
+			var fileInput = $('.change input', this.el);
+			
+			var link = $('<a href="#" class="js-change-link"/>');
+			link.text(changeLabel+'...')
+				.insertAfter(fileLink)
+				.click(function(e){
+					e.preventDefault();
+					if (clearCheckBox.is(':checked')){
+						link.removeClass('open');
+						fileLink.removeClass('deleted');
+						clearCheckBox.attr('checked', false);
+						changeDiv.hide();
+					}
+					else{
+						fileLink.addClass('deleted');
+						clearCheckBox.attr('checked', true);
+						link.addClass('open');
+						changeDiv.show();
+					}
+				});
+		}
+		
+	}    
+});

data/apps/core/forms/tags/element_label.erb

@@ -1 +1,4 @@
-<label for="{ @inputs[<%=@attributes['element']%>].full_id }">{ @inputs[<%=@attributes['element']%>].label }</label>
+<label for="{ @inputs[<%=@attributes['element']%>].full_id }">
+    { @inputs[<%=@attributes['element']%>].label }
+    <em class="form_required_symbol" sp:if="<%=@attributes['required']%>">*</em>
+</label>

data/apps/core/forms/tags/element_row.erb

@@ -1,4 +1,9 @@
-<forms:row error_condition="<%=@attributes['error_condition']%>">
-    <forms:element_label element="<%=@attributes['element']%>" />
+<%
+    error_condition = @attributes['error_condition'] ? @attributes['error_condition'] : "@inputs[#{@attributes['element']}].error?"
+    required =  @attributes['required'] ? @attributes['required'] : "@inputs[#{@attributes['element']}].required?"
+%>
+<forms:row error_condition="<%=error_condition%>" required="<%=required%>">
+    <forms:element_label element="<%=@attributes['element']%>" required="<%=required%>"/>
     <sp:run obj="@inputs[<%=@attributes['element']%>]" />
+    <sp:attribute widget="<%=@attributes['element'][1..-1]%>" name="required" value="<%=(@attributes['required']=='true')? 'true' : ''%>" />
 </forms:row>

data/apps/core/forms/tags/row.erb

@@ -1,4 +1,13 @@
-<div class="row { (<%= (@attributes['error_condition'])%>) ? 'error' : '' }">
+<%
+if @attributes['element']
+    error_condition = @attributes['error_condition'] ? @attributes['error_condition'] : "@inputs[#{@attributes['element']}].error?"
+    required =  @attributes['required'] ? @attributes['required'] : "@inputs[#{@attributes['element']}].required?"
+else
+    error_condition = @attributes['error_condition']
+    required = @attributes['required']
+end
+%>
+<div class="row { (<%=error_condition%>) ? ' error' : '' }{ (<%=required%>) ? ' required' : '' }">
     <%=@content%>
     <div style="clear: both"></div>
 </div>

data/apps/core/forms/widgets/form/form.rb

@@ -38,6 +38,7 @@ module Spider; module Forms
         attr_to_scene :inputs, :names, :hidden_inputs, :labels, :error, :errors, :sub_links
         attribute :show_related, :type => TrueClass, :default => false
         i_attribute :auto_redirect, :default => false
+        is_attribute :multipart, :default => false
         attr_accessor :save_actions
         attr_accessor :fixed
         attr_accessor :before_save, :after_save
@@ -71,6 +72,7 @@ module Spider; module Forms
             @pk ||= @_action_local
             @pk ||= params['pk']
             @pk = nil if @pk == 'new'
+            @pk = Spider::HTTP.urldecode(@pk) if @pk && @pk.is_a?(String) && !@pk.empty?
             @model = const_get_full(@model) if @model.is_a?(String)
             if (@elements.is_a?(String))
                 @elements = @elements.split(',').map{ |e| @model.elements[e.strip.to_sym] }.reject{ |i| i.nil? }
@@ -143,8 +145,14 @@ module Spider; module Forms
                 @scene.crud = @crud
                 @obj = load
                 cond = {}
-                @model.primary_keys.each do |key|
-                    cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get(key)
+                if @sub_element.integrated?
+                    @sub_element.integrated_from.model.primary_keys.each do |key|
+                        cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get("#{@sub_element.integrated_from.name}.#{key.name}")
+                    end
+                else
+                    @model.primary_keys.each do |key|
+                        cond[@sub_element.reverse.to_s+'.'+key.name.to_s] = @obj.get(key)
+                    end
                 end
                 @crud.fixed = cond
                 sub_elements = []
@@ -174,6 +182,7 @@ module Spider; module Forms
             @scene.submit_and_new_text = @attributes[:submit_and_new_text] % @scene.submit_text
             @scene.submit_and_stay_text = @attributes[:submit_and_stay_text] % @scene.submit_text
             @scene.submit_buttons = @save_actions.keys
+            @scene.enctype = 'multipart/form-data' if @multipart
             super
         end
         
@@ -215,6 +224,15 @@ module Spider; module Forms
                     widget_type = Password
                 elsif (el.type == Spider::DataTypes::Bool)
                     widget_type = Checkbox
+                elsif (el.type == Spider::DataTypes::FilePath)
+                    if el.attributes[:uploadable]
+                        widget_type = FileInput
+                        input_attributes = {:save_path => el.attributes[:base_path]}
+                        input_attributes[:save_path] = input_attributes[:save_path].call if input_attributes[:save_path].is_a?(Proc)
+                    else
+                        widget_type = Text
+                        input_attributes = {:size => 50}
+                    end
                 elsif (el.model?)
                     if ([:choice, :multiple_choice, :state, :multiple_state].include?(el.association) && !el.extended?)
                         widget_type = el.type.attributes[:estimated_size] && el.type.attributes[:estimated_size] > 30 ? 
@@ -256,6 +274,7 @@ module Spider; module Forms
                 input.model = el.type if input.respond_to?(:model)
                 input.condition = el.condition if el.condition
             end
+            @multipart = true if input.needs_multipart?
             return input
         end
         
@@ -267,8 +286,8 @@ module Spider; module Forms
         end
         
         def instantiate_obj
-            if (@pk && !@pk.empty?)
-                parts = @pk.split(':')
+            if (@pk && !@pk.to_s.empty?)
+                parts = @pk.to_s.split(':')
                 h = {}
                 @model.primary_keys.each{ |k| h[k.name] = parts.shift }
                 return @model.new(h)
@@ -294,6 +313,7 @@ module Spider; module Forms
                 input = @inputs[element_name]
                 next unless input
                 next if input.read_only?
+                input.check
 #                debug("SETTING #{element_name} TO #{@inputs[element_name].prepare_value(@data[element_name.to_s])}")
                 if (input.error?)
                     @error = true
@@ -311,7 +331,7 @@ module Spider; module Forms
 #                    obj.set(element_name, @inputs[element_name].prepare_value(@data[element_name.to_s]))
                 rescue FormatError => exc
 #                    debugger
-                    add_error(exc, exc.message, element_name)
+                    add_error(exc.message, element_name, exc)
                 end
             end
             if (@fixed)
@@ -339,15 +359,20 @@ module Spider; module Forms
                     if exc.is_a?(Spider::Model::MapperElementError)
                         Spider::Logger.error(exc)
                         exc_element =  exc.element.name
-                        add_error(exc, exc.message, exc_element)
+                        add_error(exc.message, exc_element, exc)
                     else
                         raise
                     end
                 end
                 @after_save.call(obj, save_mode) if @after_save
                 after_save(obj, save_mode)
-                if (@auto_redirect)
-                    redirect(@request.path)
+                @auto_redirect = true if @auto_redirect.is_a?(String) && @auto_redirect.strip == 'true'
+                if @auto_redirect
+                    if @auto_redirect.is_a?(String)
+                        redirect(@auto_redirect)
+                    else
+                        redirect(@request.path)
+                    end
                 end
             end
             if (action == 'submit_and_new')
@@ -364,7 +389,7 @@ module Spider; module Forms
         def after_save(obj, save_mode)
         end
         
-        def add_error(exception, message, element_name=nil)
+        def add_error(message, element_name=nil, exception=nil)
             @error = true
             @errors[element_name] ||= []
             @errors[element_name] << message
@@ -413,12 +438,20 @@ module Spider; module Forms
         end
         
         def self.parse_override(el)
+
             if (el.name == 'form:fields')
                 el.name = 'tpl:override-content'
                 el['search'] = '.fields'
             end
             el.search('form:input').each do |input|
-                new_input = "<sp:run obj=\"@inputs[:#{input['id']}]\" />"
+                input_attributes = input.attributes.to_hash
+                widget_id = input_attributes.delete('id')
+                new_input = "<sp:run obj=\"@inputs[:#{widget_id}]\" widget=\":#{widget_id}\">"
+                
+                input_attributes.each do |key, value|
+                    new_input += "<sp:attribute name=\"#{key}\" value=\"#{value}\" />"
+                end
+                new_input += "</sp:run>"
                 input.swap(new_input)
             end
             return el