card 1.15.4 → 1.15.5

data/mod/01_core/set/all/permissions.rb

@@ -1,5 +1,5 @@
 
-Card.error_codes.merge! :permission_denied=>[:denial, 403], :captcha=>[:error,449]
+Card.error_codes.merge! :permission_denied=>[:denial, 403], :captcha=>[:errors,449]
 
 
 # ok? and ok! are public facing methods to approve one action at a time
@@ -36,7 +36,7 @@ end
 
 def permission_rule_card action
   opcard = rule_card action
-  
+
   unless opcard # RULE missing.  should not be possible.  generalize this to handling of all required rules
     errors.add :permission_denied, "No #{action} rule for #{name}"
     raise Card::PermissionDenied.new(self)
@@ -90,7 +90,7 @@ def permit action, verb=nil
   if Card.config.read_only # not called by ok_to_read
     deny_because "Currently in read-only mode"
   end
-  
+
   verb ||= action.to_s
   unless permitted? action
     deny_because you_cant("#{verb} #{name.present? ? name : 'this'}")
@@ -102,7 +102,7 @@ def ok_to_create
   if @action_ok and junction?
     [:left, :right].each do |side|
       next if side==:left && @superleft   # left is supercard; create permissions will get checked there.
-      part_card = send side, :new=>{}      
+      part_card = send side, :new=>{}
       if part_card && part_card.new_card? # if no card, there must be other errors
         unless part_card.ok? :create
           deny_because you_cant("create #{part_card.name}")
@@ -199,7 +199,7 @@ event :check_permissions, :after=>:approve do
   else
     @action
   end
-  
+
   track_permission_errors do
     ok? task
   end
@@ -208,12 +208,12 @@ end
 def track_permission_errors
   @permission_errors = []
   result = yield
-  
+
   @permission_errors.each do |message|
     errors.add :permission_denied, message
   end
   @permission_errors = nil
-  
+
   result
 end
 
@@ -224,16 +224,16 @@ def recaptcha_on?
   !Auth.signed_in?     &&
   !Auth.needs_setup?   &&
   !Auth.always_ok?     &&
-  Card.toggle( rule :captcha ) 
+  Card.toggle( rule :captcha )
 end
 
 def have_recaptcha_keys?
-  @@have_recaptcha_keys = defined?(@@have_recaptcha_keys) ? @@have_recaptcha_keys : 
+  @@have_recaptcha_keys = defined?(@@have_recaptcha_keys) ? @@have_recaptcha_keys :
     !!( Card.config.recaptcha_public_key && Card.config.recaptcha_private_key )
 end
 
 event :recaptcha, :before=>:approve do
-  if !@supercard && !Env[:recaptcha_used] && recaptcha_on?     
+  if !@supercard && !Env[:recaptcha_used] && recaptcha_on?
     Env[:recaptcha_used] = true
     Env[:controller].verify_recaptcha :model=>self, :attribute=>:captcha
   end
@@ -242,43 +242,43 @@ end
 module Accounts
   # This is a short-term hack that is used in account-related cards to allow a permissions pattern where
   # permissions are restricted to the owner of the account (and, by default, Admin)
-  # That pattern should be permitted by our card representation (without creating 
+  # That pattern should be permitted by our card representation (without creating
   # separate rules for each account holder) but is not yet.
-  
+
   def permit action, verb=nil
     case
     when action==:comment  ; @action_ok = false
-    when action==:create   ; @superleft ? true : super( action, verb ) 
+    when action==:create   ; @superleft ? true : super( action, verb )
       #restricts account creation to subcard handling on permitted card (unless explicitly permitted)
     when is_own_account?   ; true
     else                   ; super action, verb
     end
   end
-  
+
 end
 
-module Follow  
+module Follow
   def ok_to_update
     permit :update
   end
-  
+
   def ok_to_create
     permit :create
   end
-  
+
   def ok_to_delete
     permit :delete
   end
-  
+
   def permit action, verb=nil
-    if [:create, :delete, :update].include?(action) && Auth.signed_in? && 
+    if [:create, :delete, :update].include?(action) && Auth.signed_in? &&
         (user = rule_user) && Auth.current_id == user.id
       return true
     else
       super action, verb
     end
   end
-  
+
 end
-  
+
 

data/mod/01_core/set/all/templating.rb

@@ -12,29 +12,34 @@ def template
   # note that a *default template is never returned for an existing card.
   @template ||= begin
     @virtual = false
+
+    # NEW CARDS
     if new_card?
-      default_card = rule_card :default, :skip_modules=>true
+      default = rule_card :default, :skip_modules=>true
 
       dup_card = dup
-      dup_card.type_id = default_card ? default_card.type_id : Card.default_type_id
-
+      dup_card.type_id = default ? default.type_id : Card.default_type_id
 
-      if content_card = dup_card.structure_rule_card
+      if structure = dup_card.structure_rule_card
         @virtual = true if junction?
-        content_card
+        self.type_id = structure.type_id if assign_type_to?(structure)
+        structure
       else
-        default_card
-      end
-    elsif tmpl = structure_rule_card
-      # this is a mechanism for repairing bad data.  like #repair_key, it should be obviated and removed.
-      if type_id != tmpl.type_id and tmpl.assigns_type?
-        repair_type tmpl.type_id
+        default
       end
-      tmpl
+
+    # EXISTING CARDS
+    elsif structure = structure_rule_card
+      repair_type structure.type_id if assign_type_to?(structure)
+      structure
     end
   end
 end
 
+def assign_type_to? structure
+  type_id != structure.type_id and structure.assigns_type?
+end
+
 def structure
   if template && template.is_structure?
     template
@@ -102,6 +107,7 @@ end
 private
 
 def repair_type template_type_id
+  # this is a mechanism for repairing bad data.  like #repair_key, it should be obviated and removed.
   self.type_id = template_type_id
   update_column :type_id, type_id
   reset_patterns

data/mod/01_core/spec/set/all/collection_spec.rb

@@ -94,6 +94,12 @@ describe Card::Set::All::Collection do
         assert_select "li > a[data-toggle=tab][data-url=#{path}]"
       end
     end
-
+    it 'handles nests as items' do
+      tabs = render_card :tabs, :name=>'tab_test', :type_id=>Card::PlainTextID, :content=>"{{A|type;title:my tab title}}"
+      assert_view_select tabs, 'div[role=tabpanel]' do
+        assert_select 'li > a[data-toggle=tab][href=#tab_test-a]', 'my tab title'
+        assert_select 'div.tab-pane#tab_test-a', 'Basic'
+      end
+    end
   end
 end

data/mod/01_history/set/all/content_history.rb

@@ -26,23 +26,23 @@ end
 def last_change_on(field, opts={})
   where_sql =  'card_actions.card_id = :card_id AND field = :field AND (draft is not true) '
   where_sql += if opts[:before]
-    'AND card_action_id < :action_id'      
+    'AND card_action_id < :action_id'
   elsif opts[:not_after]
     'AND card_action_id <= :action_id'
   else
     ''
   end
-  
+
   action_arg = opts[:before] || opts[:not_after]
   action_id = action_arg.kind_of?(Card::Action) ? action_arg.id : action_arg
   field_index = Card::TRACKED_FIELDS.index(field.to_s)
-  Change.joins(:action).where( where_sql, 
+  Change.joins(:action).where( where_sql,
     {:card_id=>id, :field=>field_index, :action_id=>action_id}
   ).order(:id).last
 end
 
 def selected_action_id
-  @selected_action_id || (@current_action and @current_action.id) || last_action_id 
+  @selected_action_id || (@current_action and @current_action.id) || last_action_id
 end
 
 def selected_action_id= action_id
@@ -55,9 +55,9 @@ def selected_action
 end
 
 def selected_content_action_id
-  @selected_action_id ||  
-  (@current_action and @current_action.new_content? and @current_action.id) || 
-  last_content_action_id 
+  @selected_action_id ||
+  (@current_action and @current_action.new_content? and @current_action.id) ||
+  last_content_action_id
 end
 
 def last_action_id
@@ -81,11 +81,13 @@ def last_actor
 end
 
 def last_act
-  last_act_on_self = acts.last
-  if last_act_on_self and (last_action.act == last_act_on_self or last_act_on_self.acted_at > last_action.act.acted_at)
-    last_act_on_self
-  else
-    last_action.act
+  if action = last_action
+    last_act_on_self = acts.last
+    if last_act_on_self and ( action.act==last_act_on_self || last_act_on_self.acted_at>action.act.acted_at )
+      last_act_on_self
+    else
+      action.act
+    end
   end
 end
 

data/mod/02_basic_types/set/type/pointer.rb

@@ -61,12 +61,12 @@ format :html do
     args ||= {}
     items = args[:item_list] || card.item_names(:context=>:raw)
     items = [''] if items.empty?
-    options_card_name = (oc = card.options_card) ? oc.cardname.url_key : ':all'
+    options_card_name = (oc = card.options_rule_card) ? oc.cardname.url_key : ':all'
 
     extra_css_class = args[:extra_css_class] || 'pointer-list-ul'
 
     %{
-      <ul class="pointer-list-editor #{extra_css_class}" options-card="#{options_card_name}">
+      <ul class="pointer-list-editor #{extra_css_class}" data-options-card="#{options_card_name}">
         #{
           items.map do |item|
             _render_list_item args.merge( :pointer_item=>item )
@@ -106,14 +106,15 @@ format :html do
 
 
   view :checkbox do |args|
-    options = card.options.map do |option|
-      checked = card.item_names.include?(option.name)
-      id = "pointer-checkbox-#{option.cardname.key}"
-      description = pointer_option_description option
+    options = card.option_names.map do |option_name|
+      checked = card.item_names.include?(option_name)
+      label = ((o_card = Card.fetch(option_name)) && o_card.label) || option_name
+      id = "pointer-checkbox-#{option_name.to_name.key}"
+      description = pointer_option_description option_name
       %{
         <div class="pointer-checkbox">
-          #{ check_box_tag "pointer_checkbox", option.name, checked, :id=>id, :class=>'pointer-checkbox-button' }
-          <label for="#{id}">#{option.name}</label>
+          #{ check_box_tag "pointer_checkbox", option_name, checked, :id=>id, :class=>'pointer-checkbox-button' }
+          <label for="#{id}">#{label}</label>
           #{ %{<div class="checkbox-option-description">#{ description }</div>} if description }
         </div>
       }
@@ -123,21 +124,23 @@ format :html do
   end
 
   view :multiselect do |args|
-    selected_options = card.item_names.map{|i_n| (c=Card.fetch(i_n) and c.name) or i_n}
-    options = options_from_collection_for_select(card.options,:name,:name,selected_options)
-    select_tag("pointer_multiselect", options, :multiple=>true, :class=>'pointer-multiselect form-control')
+    select_tag("pointer_multiselect",
+      options_for_select(card.option_names, card.item_names),
+      :multiple=>true, :class=>'pointer-multiselect form-control'
+    )
   end
 
   view :radio do |args|
     input_name = "pointer_radio_button-#{card.key}"
-    options = card.options.map do |option|
-      checked = (option.name==card.item_names.first)
-      id = "pointer-radio-#{option.cardname.key}"
-      description = pointer_option_description option
+    options = card.option_names.map do |option_name|
+      checked = (option_name==card.item_names.first)
+      id = "pointer-radio-#{option_name.to_name.key}"
+      label = ((o_card = Card.fetch(option_name)) && o_card.label) || option_name
+      description = pointer_option_description option_name
       %{
         <li class="pointer-radio radio">
-          #{ radio_button_tag input_name, option.name, checked, :id=>id, :class=>'pointer-radio-button' }
-          <label for="#{id}">#{ option.label }</label>
+          #{ radio_button_tag input_name, option_name, checked, :id=>id, :class=>'pointer-radio-button' }
+          <label for="#{id}">#{ label }</label>
           #{ %{<div class="radio-option-description">#{ description }</div>} if description }
         </li>
       }
@@ -147,14 +150,17 @@ format :html do
   end
 
   view :select do |args|
-    options = [["-- Select --",""]] + card.options.map{|x| [x.name,x.name]}
-    select_tag("pointer_select", options_for_select(options, card.item_names.first), :class=>'pointer-select form-control')
+    options = [["-- Select --",""]] + card.option_names.map{ |x| [x,x]}
+    select_tag("pointer_select",
+      options_for_select(options, card.item_names.first),
+      :class=>'pointer-select form-control'
+    )
   end
 
 
   def pointer_option_description option
     pod_name = card.rule(:options_label) || 'description'
-    dcard = Card[ "#{option.name}+#{pod_name}" ]
+    dcard = Card[ "#{option}+#{pod_name}" ]
     if dcard and dcard.ok? :read
       with_inclusion_mode :normal do
         subformat(dcard).render_core
@@ -255,7 +261,7 @@ def item_ids args={}
 end
 
 def item_type
-  opt = options_card
+  opt = options_rule_card
   if !opt or opt==self #fixme, need better recursion prevention
     nil
   else
@@ -283,6 +289,10 @@ def add_item name
     self.content="[[#{(item_names << name).reject(&:blank?)*"]]\n[["}]]"
   end
 end
+def add_item! name
+  add_item name
+  save!
+end
 
 def drop_item name
   if include_item? name
@@ -291,6 +301,10 @@ def drop_item name
     self.content = new_names.empty? ? '' : "[[#{new_names * "]]\n[["}]]"
   end
 end
+def drop_item! name
+  drop_item name
+  save!
+end
 
 def insert_item index, name
   new_names = item_names
@@ -298,14 +312,30 @@ def insert_item index, name
   new_names.insert(index,name)
   self.content =  new_names.map { |name| "[[#{name}]]" }.join "\n"
 end
+def insert_item! index, name
+  insert_item index, name
+  save!
+end
 
 
-def options_card
+def options_rule_card
   self.rule_card :options
 end
 
-def options
-  result_cards = if oc = options_card
+def option_names
+  result_cards = if oc = options_rule_card
+    oc.item_names :default_limit=>50, :context=>name
+  else
+    Card.search :sort=>'name', :limit=>50, :return=>:name
+  end
+  if selected_options = item_names
+    result_cards = result_cards | selected_options
+  end
+  result_cards
+end
+
+def option_cards
+  result_cards = if oc = options_rule_card
     oc.item_cards :default_limit=>50, :context=>name
   else
     Card.search :sort=>'alpha', :limit=>50

data/mod/03_machines/lib/javascript/wagn_mod.js.coffee

@@ -25,7 +25,7 @@ $.extend wagn,
   }
 
   initPointerList: (input)->
-    optionsCard = input.closest('ul').attr('options-card')
+    optionsCard = input.closest('ul').data('options-card')
     input.autocomplete { source: wagn.prepUrl wagn.rootPath + '/' + optionsCard + '.json?view=name_complete' }
 
   setTinyMCEConfig: (string)->

data/mod/03_machines/lib/stylesheets/style_cards.scss

@@ -894,4 +894,7 @@ html>body .open-view {
   font-size: .85em;
 }
 
+.SELF-Xperformance_log.open-view .panel-group {
+  margin-bottom: 0;
+}
 

data/mod/03_machines/set/type/scss.rb

@@ -2,21 +2,21 @@ include Type::Css
 
 def diff_args
   {:format=>:text}
-end  
+end
 
 format do
   include Css::Format
-  
+
   view :core do |args|
     compile_scss(process_content _render_raw)
   end
-  
+
   def compile_scss scss, style=:expanded
     Sass.compile scss, :style=>style
   rescue =>e
     e
   end
-  
+
 end
 
-format( :html ) { include Css::HtmlFormat }  
+format( :html ) { include Css::HtmlFormat }