spiderfw 0.6.1 → 0.6.2

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

@@ -13,6 +13,8 @@ function $W(path){
 
 
 Spider = function(){};
+if (window.SPIDER_BASE_URL) Spider.baseUrl = window.SPIDER_BASE_URL;
+else Spider.baseUrl = "";
 
 Spider.widgets = {};
 
@@ -73,6 +75,10 @@ Spider.Widget = Class.extend({
 			callback = params;
 			params = {};
 		}
+        if ($.browser.msie){
+            if (!params) params = {};
+            params['_t'] = (new Date).valueOf();
+        }
 		$C.loadWidget(this.path, params, callback);
 	},
 	

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

@@ -20,6 +20,7 @@ module Spider; module Components
         i_attribute :models, :process => lambda{ |models| models.split(/,[\s\n]*/).map{|m| const_get_full(m) } }
         is_attr_accessor :title, :default => lambda{ _("Administration") }
         is_attr_accessor :logout_url, :default => Spider::Auth.request_url+'/login/logout'
+        attr_accessor :custom_widgets
         
         def init
             @items = []
@@ -31,9 +32,19 @@ module Spider; module Components
         
         def prepare_widgets
             @models.each do |model|
+                if @user_checks && user_check = @user_checks[model]
+                    next unless @request.user
+                    next unless @request.user.respond_to?(user_check)
+                    next unless @request.user.send(user_check)
+                end
                 crud = Crud.new(@request, @response)
                 crud.id = model.name.to_s.gsub('::', '_').downcase
                 crud.model = model
+                if @custom_widgets && @custom_widgets[model]
+                    crud.table_widget = @custom_widgets[model][:table] if @custom_widgets[model][:table]
+                    crud.form_widget = @custom_widgets[model][:form] if @custom_widgets[model][:form]
+                end
+                
                 @widgets[:switcher].add(model.label_plural, crud, _('Manage Data'))
             end
             if (@request.respond_to?(:user) && @request.user)
@@ -50,11 +61,43 @@ module Spider; module Components
             super
         end
         
+        def self.parse_content(doc)
+            assets_widgets = []
+            doc.search('admin:model').each do |mod|
+                if table = mod.get_attribute('table')
+                    assets_widgets << table 
+                end
+                if form = mod.get_attribute('form')
+                    assets_widgets << form 
+                end
+            end
+            assets_widgets.uniq!
+            rc, ov = super
+            unless assets_widgets.empty?
+                ov << Hpricot("<tpl:prepend><tpl:assets widgets=\"#{assets_widgets.uniq.join(',')}\"></tpl:prepend>").root
+            end
+            [rc, ov]
+        end
+        
         def parse_runtime_content(doc, src_path)
+            @custom_widgets ||= {}
+            @user_checks ||= {}
             doc = super
             mods = []
             doc.search('admin:model').each do |mod|
-                mods << const_get_full(mod.innerText)
+                model = const_get_full(mod.innerText)
+                mods << model
+                if table = mod.get_attribute('table')
+                    @custom_widgets[model] ||= {}
+                    @custom_widgets[model][:table] = table
+                end
+                if form = mod.get_attribute('form')
+                    @custom_widgets[model] ||= {}
+                    @custom_widgets[model][:form] = form
+                end
+                if user_check = mod.get_attribute('if-user')
+                    @user_checks[model] = user_check.to_sym
+                end
             end
             doc.search('admin:app').each do |app_tag|
                 except = []

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

@@ -7,6 +7,8 @@ module Spider; module Components
         is_attr_accessor :model, :required => true
         is_attribute :action, :type => Symbol, :default => :table
         attribute :table_elements
+        i_attr_accessor :table_widget
+        i_attr_accessor :form_widget
         attr_accessor :fixed
 
         def route_widget
@@ -18,17 +20,31 @@ module Spider; module Components
             @_pass_action = (@action == :form) ? @_action : nil
             @model = const_get_full(@model) if @model.is_a?(String)
             @scene.saved = flash[:saved]
-            if (params['delete_cancel'])
+            if params['delete_cancel']
                 params.delete('delete')
                 params.delete('do_delete')
             end
-            if (params['delete'] && !params['do_delete'] && params['selected'])
+            if params['delete'] && !params['do_delete'] && params['selected']
                 @scene.ask_delete = true
             end
+            if @action == :table && @table_widget
+                custom_table = create_widget(@table_widget, 'table')
+                custom_table.model = @model if custom_table.is_a?(Spider::Components::Table)
+                @scene.custom_table = custom_table
+            end
+            if @action == :form && @form_widget
+                custom_form = create_widget(@form_widget, 'form')
+                custom_form.model = @model if custom_form.is_a?(Spider::Forms::Form)
+                @scene.custom_form = custom_form
+            end
+            
             super
-            transient_session[:table_params] ||= @widgets[:table].params if (@widgets[:table])
+            transient_session[:table_params] ||= @widgets[:table].params if @widgets[:table]
             
-            if (@action == :table)
+            if @action == :table
+                if @widgets[:table].is_a?(Spider::Components::Table) && !@widgets[:table].is_a?(Spider::Components::SearchTable)
+                    @scene.show_table_search = true
+                end
                 if params['do_delete'] && params['selected'] && params['selected'].length > 0
                     delete_rows
                     flash[:deleted] = true
@@ -42,13 +58,13 @@ module Spider; module Components
                     rows << "Altri #{total - 10}" if total > 10
                     @widgets[:ask_delete].scene.rows_to_del = rows
                 end
-            elsif (@action == :form)
+            elsif @action == :form
            #     debugger
-                if (@widgets[:form].saved?)
+                if @widgets[:form].saved?
                     flash[:saved] = true
-                    if (@widgets[:form].saved_and_new?)
+                    if @widgets[:form].saved_and_new?
                         redirect(widget_request_path+'/new')
-                    elsif (@widgets[:form].saved_and_stay?)
+                    elsif @widgets[:form].saved_and_stay?
                         redirect(widget_request_path+'/'+@widgets[:form].pk)
                     else
                         redirect(widget_request_path)
@@ -59,39 +75,44 @@ module Spider; module Components
         end
         
         def prepare_widgets
-            if (@action == :table && @widgets[:table])
+            if @action == :table && @widgets[:table]
                 @key_element = @model.primary_keys[0].name
                 table_page = nil
-                if (transient_session[:table_params])
+                if transient_session[:table_params]
                     table_page = transient_session[:table_params]['page'] if transient_session[:table_params]['page']
                 end
                 table_page = 1 if params['table_q'] || params['clear_table_q']
-                @widgets[:table].page = table_page
-                @widgets[:table].attributes[:elements] = @attributes[:table_elements]
+                @widgets[:table].page = table_page if @widgets[:table].respond_to?(:page)
+                t_els = @attributes[:table_elements]
+                if t_els && @widgets[:table].class.attribute?(:elements)
+                    @widgets[:table].attributes[:elements] = t_els
+                end
                 @widgets[:table].scene.key_element = @key_element
                 @widgets[:table].scene.crud_path = @full_path
                 @widgets[:table].scene.crud = widget_to_scene(self)
-                @table_q = params['table_q']
-                @table_q ||= transient_session[:table_q]
-                @table_q = nil if params['clear_table_q']
-                if (@table_q)
-                    @widgets[:table].add_condition(@model.free_query_condition(@table_q))
-                end
-                transient_session[:table_q] = @table_q
-                if(@condition && @widgets[:table])
-                    @widgets[:table].add_condition(@condition)
+                if @widgets[:table].respond_to?(:add_condition)
+                    @table_q = params['table_q']
+                    @table_q ||= transient_session[:table_q]
+                    @table_q = nil if params['clear_table_q']
+                    if @table_q
+                        @widgets[:table].add_condition(@model.free_query_condition(@table_q))
+                    end
+                    transient_session[:table_q] = @table_q
+                    if @condition && @widgets[:table]
+                        @widgets[:table].add_condition(@condition)
+                    end
+                    @scene.table_q = @table_q
                 end
-                @scene.table_q = @table_q
             end
-            if (@fixed)
-                if (@widgets[:table])
+            if @fixed
+                if @widgets[:table] && @widgets[:table].respond_to?(:add_condition)
                     c = Spider::Model::Condition.new(@fixed)
                     @widgets[:table].add_condition(c)
-                elsif (@widgets[:form])
+                elsif @widgets[:form]
                     @widgets[:form].fixed = @fixed
                 end
             end
-            if (@widgets[:ask_delete])
+            if @widgets[:ask_delete]
                 @widgets[:ask_delete].add_action('_w'+param_name(self)+'[delete_cancel]', _("Cancel"))
                 @widgets[:ask_delete].add_action('_w'+param_name(self)+'[do_delete]', _('Ok'))
             end
@@ -101,7 +122,7 @@ module Spider; module Components
         end
         
         def after_widget(id)
-            if (id == :table)
+            if id == :table && @widgets[:table].is_a?(Spider::Components::Table)
                 links = {}
                 table_rows = @widgets[:table].scene.data
                 table_rows.each_index do |i|

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

@@ -28,14 +28,15 @@
                 Crea nuovo
             </a>
         </div>
-        <div class="table_search" sp:if="@action == :table">
+        <div class="table_search" sp:if="@action == :table && @show_table_search">
             <form action="{ @request[:path] }" method="GET">
                 <input type="text" name="_w{ param_name(@widget) }[table_q]" value="{ @table_q }">
                 <input type="submit" name="submit" value="Trova">
                 <input type="submit" name="_w{ param_name(@widget) }[clear_table_q]" value="Pulisci">
             </form>
         </div>
-        <core:table sp:if="@action == :table" id="table" model="@model">
+        <sp:run sp:if="@action == :table && @custom_table" obj="@custom_table" />
+        <core:table sp:if="@action == :table && !@custom_table" id="table" model="@model">
             <tpl:override-content search="table .row td">
                 <a href="{ @links_to_form[row_i] }" sp:tag-if="element == @key_element"><tpl:overridden /></a>
             </tpl:override-content>
@@ -55,6 +56,7 @@
             </tpl:append>
             <tpl:override-attr search="table .paginator td" name="colspan" value="{ elements.size + 1 }" />
         </core:table>
-        <forms:form sp:if="@action == :form" id="form" model="@model" show_related="true" show_additional_buttons="true" />
+        <sp:run sp:if="@action == :form && @custom_form" obj="@custom_form" />
+        <forms:form sp:if="@action == :form && !@custom_form" id="form" model="@model" show_related="true" show_additional_buttons="true" />
     </sp:pass>
 </div>

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

@@ -15,8 +15,8 @@ module Spider; module Components
         attribute :link_id, :type => Symbol
         attribute :link
         attribute :sort
-        i_attribute :queryset
-        i_attribute :model
+        i_attr_accessor :queryset
+        i_attr_accessor :model
         attr_accessor :queryset, :condition, :page
         
         def condition
@@ -92,7 +92,7 @@ module Spider; module Components
             @elements.each do |el|
                 @scene.labels[el] = @model.elements[el].label
             end
-            @rows = prepare_queryset(@queryset ? @queryset : @model.all)
+            @rows = prepare_queryset(@queryset ? @queryset : @model.list)
             @rows.condition.and(self.condition) if self.condition && !self.condition.empty?
             if (@attributes[:paginate])
                 @rows.limit = @attributes[:row_limit]

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

@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Forms 0.1\n"
-"POT-Creation-Date: 2010-11-29 12:48+0100\n"
+"POT-Creation-Date: 2011-05-09 17:37+0200\n"
 "PO-Revision-Date: 2010-11-29 12:52+0100\n"
 "Last-Translator: Ivan Pirlik <ivan.pirlik@soluzionipa.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,11 +32,11 @@ msgstr "%s e nuovo"
 msgid "%s and stay"
 msgstr "%s e rimani"
 
-#: widgets/inputs/date_time/date_time.rb:22
+#: widgets/inputs/date_time/date_time.rb:25
 msgid "%s is not a valid date"
 msgstr "%s non è una data valida"
 
-#: widgets/inputs/input/input.rb:94
+#: widgets/inputs/input/input.rb:91
 msgid "%s is required"
 msgstr "Il campo %s è obbligatorio"
 
@@ -58,4 +59,3 @@ msgstr "Minuti"
 #: widgets/inputs/time_span/time_span.shtml:6
 msgid "Hours"
 msgstr "Ore"
-

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

@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Forms 0.1\n"
-"POT-Creation-Date: 2010-11-29 12:48+0100\n"
+"POT-Creation-Date: 2011-05-09 17:37+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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,11 +33,11 @@ msgstr ""
 msgid "%s and stay"
 msgstr ""
 
-#: widgets/inputs/date_time/date_time.rb:22
+#: widgets/inputs/date_time/date_time.rb:25
 msgid "%s is not a valid date"
 msgstr ""
 
-#: widgets/inputs/input/input.rb:94
+#: widgets/inputs/input/input.rb:91
 msgid "%s is required"
 msgstr ""