card 1.16.14 → 1.16.15

data/mod/05_standard/set/all/rich_html/form.rb

@@ -2,26 +2,29 @@ format :html do
   def edit_slot args={}
     # note: @mode should already be :edit here...
     if args[:structure] || card.structure
-      # multi-card editing
-
-      if args[:core_edit] #need better name
-        _render_core args
-      else
-        process_relative_tags optional_toolbar: :hide,
-                              structure: args[:structure]
-      end
+      multi_card_edit_slot args
+    else
+      single_card_edit_slot args
+    end
+  end
 
+  def multi_card_edit_slot args
+    if args[:core_edit] # need better name
+      _render_core args
     else
-      # single-card edit mode
-      field = content_field form, args
+      process_relative_tags optional_toolbar: :hide,
+                            structure: args[:structure]
+    end
+  end
 
-      if [args[:optional_type_formgroup], args[:optional_name_formgroup]]
-         .member? :show
-        # display content field in formgroup for consistency with other fields
-        formgroup '', field, editor: :content
-      else
-        editor_wrap( :content ) { field }
-      end
+  def single_card_edit_slot args
+    field = content_field form, args
+    if [args[:optional_type_formgroup], args[:optional_name_formgroup]]
+       .member? :show
+      # display content field in formgroup for consistency with other fields
+      formgroup '', field, editor: :content
+    else
+      editor_wrap(:content) { field }
     end
   end
 
@@ -44,8 +47,8 @@ format :html do
     form_for card, card_form_opts(action, opts) do |form|
       @form = form
       %{
-        #{ hidden_tags hidden_args if hidden_args }
-        #{ yield form }
+        #{hidden_tags hidden_args if hidden_args}
+        #{yield form}
       }
     end
   end
@@ -61,14 +64,9 @@ format :html do
   end
 
   def card_form_opts action, html={}
-    url, action = case action
-      when Symbol ;  [ path(action: action) , action          ]
-      when Hash   ;  [ path(action)          , action[:action] ]
-      when String ;  [ card_path(action)     , nil             ] #deprecated
-      else        ;  raise Card::Error, "unsupported card_form action class: #{action.class}"
-      end
+    url, action = url_from_action(action)
 
-    klasses = Array.wrap( html[:class] )
+    klasses = Array.wrap(html[:class])
     klasses << 'card-form slotter'
     klasses << 'autosave' if action == :update
     html[:class] = klasses.join ' '
@@ -79,33 +77,51 @@ format :html do
     { url: url, remote: true, html: html }
   end
 
+  def url_from_action action
+    case action
+    when Symbol
+      [path(action: action), action]
+    when Hash
+      [path(action), action[:action]]
+    when String # deprecated
+      [card_path(action), nil]
+    else
+      raise Card::Error, "unsupported card_form action class: #{action.class}"
+    end
+  end
+
   def editor_wrap type=nil
-    content_tag( :div, class: "editor#{ " #{type}-editor" if type }" ) { yield.html_safe }
+    html_class = 'editor'
+    html_class << " #{type}-editor" if type
+    content_tag(:div, class: html_class) { yield.html_safe }
   end
 
   def formgroup title, content, opts={}
-    help_text =
-      case opts[:help]
-      when String ; _render_help help_class: 'help-block', help_text: opts[:help]
-      when true   ; _render_help help_class: 'help-block'
-      else        ; nil
-      end
-
-    div_args = { class: ['form-group', opts[:class]].compact*' ' }
-    div_args[:card_id  ] = card.id     if card.real?
-    div_args[:card_name] = h card.name if card.name.present?
-
-    wrap_with :div, div_args do
+    wrap_with :div, formgroup_div_args(opts[:class]) do
       %{
-        <label>#{ title }</label>
+        <label>#{title}</label>
         <div>
-          #{ editor_wrap( opts[:editor] ) { content } }
-          #{ help_text }
+          #{editor_wrap(opts[:editor]) { content }}
+          #{formgroup_help_text opts[:help]}
         </div>
       }
     end
   end
 
+  def formgroup_div_args html_class
+    div_args = { class: ['form-group', html_class].compact.join(' ') }
+    div_args[:card_id] = card.id if card.real?
+    div_args[:card_name] = h card.name if card.name.present?
+    div_args
+  end
+
+  def formgroup_help_text text=nil
+    case text
+    when String then _render_help help_class: 'help-block', help_text: text
+    when true   then _render_help help_class: 'help-block'
+    end
+  end
+
   def hidden_tags hash, base=nil
     # convert hash into a collection of hidden tags
     result = ''
@@ -125,7 +141,7 @@ format :html do
   # FIELDSET VIEWS
 
   view :name_formgroup do |args|
-    formgroup 'name', raw( name_field form ), editor: 'name', help: args[:help]
+    formgroup 'name', raw(name_field form), editor: 'name', help: args[:help]
   end
 
   view :type_formgroup do |args|
@@ -150,26 +166,29 @@ format :html do
     }
   end
 
-
   def name_field form=nil, options={}
     form ||= self.form
-    text_field( :name, {
-      value: card.name, #needed because otherwise gets wrong value if there are updates
+    text_field(:name, {
+      # needed because otherwise gets wrong value if there are updates
+      value: card.name,
       autocomplete: 'off'
     }.merge(options))
   end
 
   def type_field args={}
     typelist = Auth.createable_types
-    current_type = unless args.delete :no_current_type
-        unless card.new_card? || typelist.include?( card.type_name )
-          # current type should be an option on existing cards, regardless of create perms
-          typelist = (typelist << card.type_name).sort
+    current_type =
+      unless args.delete :no_current_type
+        if !card.new_card? && !typelist.include?(card.type_name)
+          # current type should be an option on existing cards,
+          # regardless of create perms
+          typelist.push(card.type_name).sort!
         end
-        Card[ card ? card.type_id : Card.default_type_id ].name
+        card.type_name_or_default
       end
 
-    options = options_from_collection_for_select typelist, :to_s, :to_s, current_type
+    options = options_from_collection_for_select typelist, :to_s, :to_s,
+                                                 current_type
     template.select_tag 'card[type]', options, args
   end
 
@@ -177,34 +196,36 @@ format :html do
     @form = form
     @nested = options[:nested]
     card.last_action_id_before_edit = card.last_action_id
-    revision_tracking = if card && !card.new_card? && !options[:skip_rev_id]
-      hidden_field :last_action_id_before_edit, class: 'current_revision_id'
-      #hidden_field_tag 'card[last_action_id_before_edit]', card.last_action_id, class: 'current_revision_id'
-    end
+    revision_tracking =
+      if card && !card.new_card? && !options[:skip_rev_id]
+        hidden_field :last_action_id_before_edit, class: 'current_revision_id'
+        # hidden_field_tag 'card[last_action_id_before_edit]',
+        # card.last_action_id, class: 'current_revision_id'
+      end
     %{
-      #{ revision_tracking
-       }
-      #{ _render_editor options }
+      #{revision_tracking}
+      #{_render_editor options}
     }
   end
 
+  # FIELD VIEWS
 
-# FIELD VIEWS
-
-  view :editor do |args|
-    text_area :content, rows: 3, class: 'tinymce-textarea card-content', id: unique_id
+  view :editor do |_args|
+    text_area :content, rows: 3, class: 'tinymce-textarea card-content',
+                        id: unique_id
   end
 
   view :edit_in_form, perms: :update, tags: :unknown_ok do |args|
     eform = form_for_multi
-
-    content = content_field eform, args.merge( nested: true )
+    content = content_field eform, args.merge(nested: true)
+    if card.new_card?
+      content += raw("\n #{ eform.hidden_field :type_id }")
+    end
     opts = { editor: 'content', help: true, class: 'card-editor' }
-
-    content      += raw( "\n #{ eform.hidden_field :type_id }" )  if card.new_card?
-    opts[:class] += " RIGHT-#{ card.cardname.tag_name.safe_key }" if card.cardname.junction?
-
-    formgroup fancy_title( args[:title] ), content, opts
+    if card.cardname.junction?
+      opts[:class] += " RIGHT-#{ card.cardname.tag_name.safe_key }"
+    end
+    formgroup fancy_title(args[:title]), content, opts
   end
 
   def process_relative_tags args
@@ -212,31 +233,52 @@ format :html do
       nested_card = fetch_nested_card chunk.options
       nest nested_card, chunk.options.reverse_merge(args)
     end.join "\n"
-    # _render_raw(args).scan( /\{\{\s*\+[^\}]*\}\}/ ).map do |inc| #fixme - wrong place for regexp!
-    #   process_content( inc ).strip
-    # end.join
   end
 
   # form helpers
 
-  FIELD_HELPERS = %w{hidden_field color_field date_field datetime_field datetime_local_field
-    email_field month_field number_field password_field phone_field
-    range_field search_field telephone_field text_area text_field time_field
-    url_field week_field file_field}
-
+  FIELD_HELPERS =
+    %w{
+      hidden_field color_field date_field datetime_field datetime_local_field
+      email_field month_field number_field password_field phone_field
+      range_field search_field telephone_field text_area text_field time_field
+      url_field week_field file_field
+    }
 
   FIELD_HELPERS.each do |method_name|
-    define_method(method_name) do |name, options = {}|
+    define_method(method_name) do |name, options={}|
       form.send(method_name, name, options)
     end
   end
 
-  def check_box method, options={}, checked_value = "1", unchecked_value = "0"
+  def check_box method, options={}, checked_value = '1', unchecked_value = '0'
     form.check_box method, options, checked_value, unchecked_value
   end
 
-  def radio_button method, tag_value, options = {}
+  def radio_button method, tag_value, options={}
     form.radio_button method, tag_value, options
   end
 
+  def submit_button args={}
+    args.reverse_merge!(
+      situation: 'primary',
+      data: {}
+    )
+    text = args.delete(:text) || 'Submit'
+    args[:data][:disable_with] ||= args.delete(:disable_with) || 'Submitting'
+    button_tag text, args
+  end
+
+  # redirect to *previous if no :href is given
+  def cancel_button args={}
+    args.reverse_merge! type: 'button'
+    if args[:href]
+      add_class args, 'slotter'
+    else
+      add_class args, 'redirecter'
+      args[:href] = Card.path_setting('/*previous')
+    end
+    text = args.delete(:text) || 'Cancel'
+    button_tag text, args
+  end
 end

data/mod/05_standard/set/all/rich_html/modal.rb

@@ -1,22 +1,15 @@
 format :html do
-
-
-
-
   view :modal_link do |args|
     path_opts = args[:path_opts] || {}
     path_opts.merge!(layout: :modal)
     html_args = args[:html_args] || {}
-    #html_args.merge!('data-target'=>"#modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}",
-    html_args.merge!('data-target'=>"#modal-main-slot",
-      'data-toggle'=>'modal')
+    html_args.merge!('data-target' => '#modal-main-slot',
+                     'data-toggle' => 'modal')
     link_to(args[:text] || _render_title(args), path(path_opts), html_args)
   end
 
   view :modal_slot do |args|
-    #wrap_with(:div, class: 'modal fade', role: 'dialog', id: "modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}") do
-    id = "modal-"
-    id += (args[:modal_id] || 'main-slot')
+    id = "modal-#{args[:modal_id] || 'main-slot'}"
     wrap_with(:div, class: 'modal fade', role: 'dialog', id: id) do
       wrap_with(:div, class: 'modal-dialog') do
         content_tag :div, class: 'modal-content' do
@@ -26,16 +19,19 @@ format :html do
     end
   end
 
-
-  view :modal_menu, tags: :unknown_ok do |args|
+  view :modal_menu, tags: :unknown_ok do
     popout_params = {}
     popout_params[:view] = params[:view] if params[:view]
-    # we probably want to pass on a lot more params than just view, but not all of them
+    # we probably want to pass on a lot more params than just view,
+    # but not all of them
     # (eg we don't want layout, id, controller...)
     wrap_with :div, class: 'modal-menu' do
       [
-        link_to( glyphicon('remove'), '', class: 'close-modal pull-right close', 'data-dismiss'=>'modal'),
-        link_to( glyphicon('new-window'), popout_params, class: 'pop-out-modal pull-right close ' )
+        link_to(glyphicon('remove'), '',
+                class: 'close-modal pull-right close',
+                'data-dismiss' => 'modal'),
+        link_to(glyphicon('new-window'), popout_params,
+                class: 'pop-out-modal pull-right close ')
       ]
     end
   end
@@ -45,48 +41,9 @@ format :html do
   end
 
   def default_modal_footer_args args
-    args[:buttons] ||=  button_tag 'Close', class: 'btn-xs close-modal pull-right', 'data-dismiss'=>'modal'
-  end
-
-=begin
-  def default_modal_content_args args
-    args[:buttons] ||= button_tag 'Close', 'data-dismiss'=>'modal'
-  end
-
-  view :modal_link_and_dialog do |args|
-    _render_modal_link(args) + _render_modal(args)
-  end
-
-
-
-  # use modal_content for ajax calls to fill a modal_slot with content
-  view :modal_content do |args|
-    output [
-      wrap_with( :div, _render_modal_header(args), class: 'modal-header' ),
-      wrap_with( :div, _render_modal_body(args),   class: 'modal-body' ),
-      wrap_with( :div, _render_modal_footer(args), class: 'modal-footer' ),
-    ]
+    args[:buttons] ||=
+      button_tag 'Close',
+                 class: 'btn-xs close-modal pull-right',
+                 'data-dismiss' => 'modal'
   end
-
-  view :modal_header do |args|
-    _render_modal_title(args)
-  end
-
-  view :modal_body do |args|
-    _render_core(args)
-  end
-
-  view :modal_footer do |args|
-    args[:buttons] || ''
-  end
-
-  view :modal_title do |args|
-    "<h4>#{_render_title args.merge(title_class: 'modal-title')}</h4>"
-  end
-
-  view :modal do |args|
-    _render_modal_slot args.merge(optional_modal_content: :show)
-  end
-=end
-
 end

data/mod/05_standard/set/right/account.rb

@@ -70,13 +70,13 @@ event :require_email, on: :create, after: :approve do
   errors.add :email, 'required' unless subfield(:email)
 end
 
-event :set_default_salt, on: :create, before: :process_subcards do
+event :set_default_salt, on: :create, before: :approve_subcards do
   salt = Digest::SHA1.hexdigest "--#{Time.zone.now}--"
   Env[:salt] = salt # HACK!!! need viable mechanism to get this to password
   add_subfield :salt, content: salt
 end
 
-event :set_default_status, on: :create, before: :process_subcards do
+event :set_default_status, on: :create, before: :approve_subcards do
   default_status = Auth.needs_setup? ? 'active' : 'pending'
   add_subfield :status, content: default_status
 end

data/mod/05_standard/set/right/email.rb

@@ -21,9 +21,10 @@ end
 event :validate_unique_email, after: :validate_email, on: :save do
   if content.present?
     Auth.as_bot do
-      wql = { right_id: Card::EmailID, eq: content }
+      wql = { right_id: Card::EmailID, eq: content, return: :id }
       wql[:not] = { id: id } if id
-      if Card.search(wql).first
+      wql_comment = "email duplicate? (#{content})"
+      if Card.search(wql, wql_comment).first
         errors.add :content, 'must be unique'
       end
     end

data/mod/05_standard/set/rstar/rules.rb

@@ -146,9 +146,9 @@ format :html do
     args[:delete_button] ||= delete_button args
     args[:cancel_button] ||=
       begin
-        cancel_path = path view: ( card.new_card? ? :closed_rule : :open_rule ), success: false
-        button_tag( 'Cancel', class: 'rule-cancel-button slotter', type: 'button',
-                          href: cancel_path )
+        cancel_view = card.new_card? ? :closed_rule : :open_rule
+        cancel_button class: 'rule-cancel-button',
+                      href: path(view: cancel_view, success: false)
       end
   end