spiderfw 0.6.1 → 0.6.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+= 0.6.2
+= 10 June, 2011
+* More flexible Admin widget
+* Fixes and enhancements
+
 = 0.6.1
 == 2 May, 2011
 * Bundler support

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/apps/core/auth/lib/rbac.rb

@@ -5,14 +5,25 @@ module RBAC
     def self.define_context(name, permissions=nil, options={})
         permissions ||= Spider::OrderedHash[]
         @contexts ||= {}
+        @labels ||= {}
+        inline_data = Spider::OrderedHash[]
         permissions.clone.each do |k, v|
             unless v.is_a?(Hash)
                permissions[k] = {:label => v}
             end
+            inline_data[k] = permissions[k][:label]
         end
         @contexts[name] = permissions
         @options ||= {}
         @options[name] = options
+        @labels[name] = inline_data
+    end
+
+
+    def self.add_to_context(name, key, val)
+        val = {:label => val} unless val.is_a?(Hash)
+        @contexts[name][key] = val
+        @labels[name][key] = val[:label]
     end
 
     def self.context(name)
@@ -22,6 +33,10 @@ module RBAC
     def self.context?(name)
         @contexts[name] != nil
     end
+
+    def self.labels(name)
+        @labels[name]
+    end
     
     def self.options(name)
         @options[name] || {}

data/apps/core/auth/models/mixins/rbac_provider.rb

@@ -17,7 +17,8 @@ module Spider; module Auth
             el = self.class.rbac_provider_elements[context]
             options = RBAC.options(context)
             if options[:superuser]
-                val = self.get(options[:superuser])
+                val = nil
+                val = self.get(options[:superuser]) if self.class.elements[options[:superuser]]
                 return true if val
             end
             val = self.get(el)
@@ -59,12 +60,13 @@ module Spider; module Auth
                 @rbac_provider_elements[context] = :"#{context}_permissions"
                 inline_data = Spider::OrderedHash.new
                 permissions = RBAC.context(context)
-                permissions.each do |k, v|
-                    inline_data[k] = v[:label]
-                end
+                options = RBAC.options(context)
+                inline_data = RBAC.labels(context)
+                rbac_name = @rbac_provider_elements[context]
+                el_label = options[:element_label] || _("%s permissions") % context.to_s.gsub(/_+/, ' ').capitalize
                 
-                self.multiple_choice @rbac_provider_elements[context], inline_data,
-                    :label => _("%s permissions") % context.to_s.gsub(/_+/, ' ').capitalize,
+                self.multiple_choice rbac_name, inline_data,
+                    :label => el_label,
                     :inline_model => [[:id, String, {:primary_key => true}], [:desc, String]]
                 permissions.each do |k, v|
                     if models = v[:with_models]
@@ -96,9 +98,25 @@ module Spider; module Auth
                                 el_name ||= "#{context}_#{k}_#{model_name}".to_sym
                                 reverse_name ||= "#{context}_#{k}_#{self_name}".to_sym
                             end
-                            self.many el_name, model, :add_multiple_reverse => {
-                                :name => reverse_name, :rbac_reverse => [context, k], :version_content => false
-                            }, :delete_cascade => true, :rbac => [context, k], :version_content => false
+                            choice_condition = Spider::Model::Condition.new{ |provider| (provider.__el(rbac_name) == k) }
+                            if self.elements[options[:superuser]]
+                                choice_condition.and(Spider::Model::Condition.new{ |provider|
+                                    (provider.__el(options[:superuser]) .not true)
+                                })
+                            end
+                            attributes = {
+                                :add_multiple_reverse => {
+                                    :name => reverse_name, :rbac_reverse => [context, k], :version_content => false, :association => :multiple_choice,
+                                    :choice_condition => choice_condition
+                                }, :delete_cascade => true, :rbac => [context, k], :version_content => false, 
+                                   :association => :multiple_choice
+                            }
+                            labels = v[:model_labels]
+                            if labels && labels[model] && lbls = labels[model][self.name]
+                                attributes[:label] = lbls[0]
+                                attributes[:add_multiple_reverse][:label] = lbls[1]
+                            end
+                            self.many el_name, model, attributes
                         end
                     end
                 end
@@ -119,4 +137,4 @@ module Spider; module Auth
         
     end
     
-end; end
+end; end

data/apps/core/auth/po/it/spider_auth.po

@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Auth 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-02 18:13+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"
@@ -47,7 +48,7 @@ msgstr "Ultima login"
 msgid "Login count"
 msgstr "Numero login"
 
-#: models/mixins/rbac_provider.rb:41
+#: models/mixins/rbac_provider.rb:68
 msgid "%s permissions"
 msgstr "Permessi %s"
 

data/apps/core/auth/po/spider_auth.pot

@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Auth 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 16:58+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"
@@ -46,7 +47,7 @@ msgstr ""
 msgid "Login count"
 msgstr ""
 
-#: models/mixins/rbac_provider.rb:41
+#: models/mixins/rbac_provider.rb:68
 msgid "%s permissions"
 msgstr ""
 

data/apps/core/auth/views/login.shtml

@@ -9,7 +9,7 @@
     <div class='logout' sp:if='@did_logout'>
         Logout eseguito
     </div>
-    <form action='do_login' method='POST'>
+    <form action='{ @controller[:request_url] }/do_login' method='POST'>
         <input type="hidden" name="redirect" value="{ @redirect }">
         <div class='row'>
             <label for='login'>Login:</label>

data/apps/core/components/po/it/spider_components.po

@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Components 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:51+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"
@@ -43,12 +44,19 @@ msgstr "Vai"
 msgid "Clear"
 msgstr "Pulisci"
 
+#: widgets/table/table.rb:150 public/js/utils.js:14
+msgid "Yes"
+msgstr "Sì"
+
+#: widgets/table/table.rb:150 public/js/utils.js:19
+msgid "No"
+msgstr "No"
+
 #: widgets/list/list.shtml:10
 msgid "Search"
 msgstr "Cerca"
 
-#: widgets/list/list.shtml:17
-#: widgets/table/table.shtml:45
+#: widgets/list/list.shtml:17 widgets/table/table.shtml:47
 msgid "No element"
 msgstr "Nessun elemento"
 
@@ -59,12 +67,3 @@ msgstr "Elimina"
 #: public/js/utils.js:9
 msgid "Are you sure?"
 msgstr "Sei sicuro?"
-
-#: public/js/utils.js:14
-msgid "Yes"
-msgstr "Sì"
-
-#: public/js/utils.js:19
-msgid "No"
-msgstr "No"
-

data/apps/core/components/po/spider_components.pot

@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Spider::Components 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 16:58+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"
@@ -44,11 +45,19 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
+#: widgets/table/table.rb:150 public/js/utils.js:14
+msgid "Yes"
+msgstr ""
+
+#: widgets/table/table.rb:150 public/js/utils.js:19
+msgid "No"
+msgstr ""
+
 #: widgets/list/list.shtml:10
 msgid "Search"
 msgstr ""
 
-#: widgets/list/list.shtml:17 widgets/table/table.shtml:45
+#: widgets/list/list.shtml:17 widgets/table/table.shtml:47
 msgid "No element"
 msgstr ""
 
@@ -59,11 +68,3 @@ msgstr ""
 #: public/js/utils.js:9
 msgid "Are you sure?"
 msgstr ""
-
-#: public/js/utils.js:14
-msgid "Yes"
-msgstr ""
-
-#: public/js/utils.js:19
-msgid "No"
-msgstr ""

data/apps/core/components/public/css/crud.css

@@ -56,3 +56,7 @@
     color: white;
     font-weight:bold;
 }
+
+.wdgt-Spider-Components-Crud  .wdgt-Spider-Components-Confirm ul{
+    margin-left: 20px;
+}

data/apps/core/components/public/js/jquery/jquery-ui-1.8.11/css/Aristo/jquery-ui.custom.css

@@ -448,6 +448,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-tabs-panel .ui-button { border-width: 0px; background: transparent; }
 
 /* === Datepicker === */
+#ui-datepicker-div{ display: none; }
 .ui-datepicker { width: 17em; padding: .2em .2em 0; background: #FFFFFF url(images/datepicker.gif) left top repeat-x; -moz-box-shadow: 0px 5px 10px rgba(0,0,0,0.8); -webkit-box-shadow: 0px 5px 10px rgba(0,0,0,0.8); box-shadow: 0px 5px 10px rgba(0,0,0,0.8); }
 .ui-datepicker .ui-datepicker-header { position:relative; padding:2px 0px 6px 0px; background: transparent; -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; border: 0px none; }
 .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 6px; width: 16px; height: 16px; border: 0px none; cursor: pointer; }

data/apps/core/components/public/js/jquery/plugins/bsmselect/README.md

@@ -178,6 +178,7 @@ The newly created select default option is the original select title attribute:
   * [Ryan Cramer](http://www.ryancramer.com/) is the author of the original asmSelect
   * [Victor Berchet](http://github.com/vicb) is the author of bsmSelect
   * [Andy Fowler](http://github.com/andyfowler) has contributed many enhancements
+  * [Cracky](https://github.com/Cracky)
 
 ## History ##
 

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

@@ -2,13 +2,13 @@
  * Better Select Multiple - jQuery Plugin
  *
  * based on Alternate Select Multiple (asmSelect) 1.0.4a beta (http://www.ryancramer.com/projects/asmselect/)
- * 
+ *
  * Copyright (c) 2009 by Ryan Cramer - http://www.ryancramer.com
  * Copyright (c) 2010 by Victor Berchet - http://www.github.com/vicb
  *
  * Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
  *
- * bsmSelect version: v1.4.2 - 2011-02-22
+ * bsmSelect version: v1.4.3 - 2011-05-05
  */
 
 (function($) {
@@ -53,10 +53,10 @@
         click: $.proxy(this.selectClickEvent, this)
       });
 
-      this.$list = $.isFunction(o.listType) 
+      this.$list = $.isFunction(o.listType)
         ? o.listType(this.$original)
         : $('<' + o.listType + '>', { id: o.listClass + this.uid });
-      
+
       this.$list.addClass(o.listClass);
 
       this.$container = $('<div>', { 'class':  o.containerClass, id: this.uid });
@@ -124,7 +124,7 @@
      */
     buildSelect: function() {
       var self = this;
-      
+
       this.buildingSelect = true;
 
       // add a first option to be the home option / default selectLabel
@@ -174,7 +174,7 @@
     addSelectOptionGroup: function($parent, $group)
     {
       var self = this,
-        $G = $('<optgroup>', { label: $group.attr('label')} ).appendTo($parent);        
+        $G = $('<optgroup>', { label: $group.attr('label')} ).appendTo($parent);
       if ($group.is(':disabled')) { $G.attr('disabled', 'disabled'); }
       $('option', $group).each(function() { self.addSelectOption($G, $(this)); });
     },
@@ -238,7 +238,7 @@
       this.disableSelectOption($bsmOpt.data('item', $item));
 
       switch (o.addItemTarget) {
-        case 'top':
+        case 'bottom':
           this.$list.append($item.hide());
           break;
         case 'original':
@@ -255,7 +255,7 @@
         default:
           this.$list.prepend($item.hide());
       }
-            
+
       if (this.buildingSelect) {
         $.bsmSelect.effects.show($item);
       } else {
@@ -287,7 +287,7 @@
      * @param {String} type     Event type
      */
     triggerOriginalChange: function($origOpt, type) {
-      this.ignoreOriginalChangeEvent = true;      
+      this.ignoreOriginalChangeEvent = true;
       this.$original.trigger('change', [{
         option: $origOpt,
         value: $origOpt.val(),
@@ -316,9 +316,9 @@
       remove: function($el) { $el.remove(); },
 
       highlight: function ($select, $item, label, conf) {
-        var $highlight, 
+        var $highlight,
           id = $select.attr('id') + conf.highlightClass;
-        $('#' + id).remove();       
+        $('#' + id).remove();
         $highlight = $('<span>', {
           'class': conf.highlightClass,
           id: id,