card 1.91 → 1.92

data/mod/settings/set/abstract/permission.rb

@@ -106,7 +106,7 @@ format :html do
   def core_inherit_for_content_for_self_set set_context
     task = card.tag.codename
     ancestor = Card[set_context.trunk_name.trunk_name]
-    links = ancestor.who_can(task.to_sym).map do |card_id|
+    links = ancestor.who_can(task).map do |card_id|
       link_to_card card_id, nil, target: args[:target]
     end * ", "
     "Inherit ( #{links} )"

data/mod/settings/set/right/structure.rb

@@ -3,7 +3,6 @@ format :rss do
     [card]
   end
 end
-
 format :html do
   include AddHelp::HtmlFormat
 end

data/mod/settings/set/self/recent_settings.rb

@@ -1,3 +1,7 @@
+def history?
+  false
+end
+
 def followable?
   false
 end

data/mod/standard/set/abstract/search.rb

@@ -97,7 +97,7 @@ format :csv do
 
   view :card_list do
     items = super()
-    if @depth.zero?
+    if depth.zero?
       title_row + items
     else
       items

data/mod/standard/set/all/error.rb

@@ -43,7 +43,7 @@ format do
   end
 
   view :too_slow, perms: :none, closed: true do
-    %( Timed out! #{showname} took too long to load. )
+    %( Timed out! #{title_in_context} took too long to load. )
   end
 end
 
@@ -99,19 +99,19 @@ format :html do
   view :missing do
     return "" unless card.ok? :create  # should this be moved into ok_view?
     path_opts = voo.type ? { card: { type: voo.type } } : {}
-    link_text = "Add #{fancy_title _render_title}"
+    link_text = "Add #{_render_title}"
     klass = "slotter missing-#{@denied_view || voo.home_view}"
     wrap { link_to_view :new, link_text, path: path_opts, class: klass }
   end
 
   view :closed_missing, perms: :none do
-    wrap_with :span, showname, class: "faint"
+    wrap_with :span, title_in_context, class: "faint"
   end
 
-  view :conflict, error_code: 409 do
+  view :conflict, error_code: 409, cache: :never do
     actor_link = link_to_card card.last_action.act.actor.cardname
     expanded_act = wrap do
-      _render_act_expanded act: card.last_action.act, current_rev_nr: 0
+      _render_act act: card.last_action.act, act_seq: 0
     end
     class_up "card-slot", "error-view"
     wrap do # ENGLISH below

data/mod/standard/set/all/links.rb

@@ -53,9 +53,8 @@ format do
   def link_to_card cardish, text=nil, opts={}
     opts[:path] ||= {}
     name = opts[:path][:mark] = Card::Name.cardish cardish
-    text ||= name.to_name.to_show @context_names
     add_known_or_wanted_class opts, name
-    link_to text, opts
+    link_to (text || name), opts
   end
 
   def add_known_or_wanted_class opts, name

data/mod/standard/set/all/list_changes.rb

@@ -16,7 +16,7 @@ end
 event :trunk_cardtype_of_a_list_relation_changed, :finalize,
       changed: :type, on: :update,
       when: proc { Codename[:list] } do
-  type_key_was = (tk = Card.quick_fetch(type_id_was)) && tk.key
+  type_key_was = (tk = Card.quick_fetch(type_id_before_last_save)) && tk.key
 
   list_fields.each do |card|
     card.update_listed_by_cache_for card.item_keys, type_key: type_key_was

data/mod/standard/set/all/rich_html/content.rb

@@ -89,7 +89,7 @@ format :html do
   end
 
   view :title_link do |args|
-    title_text = args[:title_ready] || showname(voo.title)
+    title_text = args[:title_ready] || pov_name(voo.title)
     link_to_card card.cardname, title_text
   end
 
@@ -119,12 +119,14 @@ format :html do
   end
 
   view :closed do
-    voo.show :toggle
-    voo.hide! :toolbar
-    class_up "d0-card-body", "closed-content"
-    @content_body = true
-    @toggle_mode = :close
-    frame { _optional_render :closed_content }
+    with_nest_mode :closed do
+      voo.show :toggle
+      voo.hide! :toolbar
+      class_up "d0-card-body", "closed-content"
+      @content_body = true
+      @toggle_mode = :close
+      frame { _optional_render :closed_content }
+    end
   end
 
   view :change do
@@ -171,15 +173,20 @@ format :html do
 
   def related_options args
     options = (args[:related] || params[:related])
-    options = { name: options } if options.is_a? String
-    return unless options.is_a? Hash
-    options.symbolize_keys
+    case options
+    when String
+      { name: options }
+    when Hash
+      options.symbolize_keys
+    when ActionController::Parameters
+      options.to_unsafe_h.symbolize_keys
+    end
   end
 
   def related_card_from_options options
     related_card = options.delete :card
     return related_card if related_card
-    related_name = options.delete(:name).to_name.to_absolute_name card.cardname
+    related_name = options.delete(:name).to_name.absolute_name card.cardname
     Card.fetch related_name, new: {}
   end
 
@@ -220,11 +227,9 @@ format :html do
     )
   end
 
-  private
-
   def fancy_title title=nil
     wrap_with :span, class: classy("card-title") do
-      showname(title).to_name.parts.join fancy_joint
+      title.to_name.parts.join fancy_joint
     end
   end
 
@@ -232,3 +237,4 @@ format :html do
     wrap_with :span, "+", classy("joint")
   end
 end
+

data/mod/standard/set/all/rich_html/editing.rb

@@ -1,13 +1,15 @@
 format :html do
   ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
   view :edit, perms: :update, tags: :unknown_ok, cache: :never do
-    voo.show :toolbar, :help
-    frame_and_form :update, edit_form_opts do
-      [
-        edit_view_hidden,
-        _optional_render_content_formgroup,
-        _optional_render_edit_buttons
-      ]
+    with_nest_mode :edit do
+      voo.show :toolbar, :help
+      frame_and_form :update, edit_form_opts do
+        [
+          edit_view_hidden,
+          _optional_render_content_formgroup,
+          _optional_render_edit_buttons
+        ]
+      end
     end
   end
 

data/mod/standard/set/all/rich_html/form.rb

@@ -20,7 +20,8 @@ format :html do
 
   view :edit_in_form, cache: :never, perms: :update, tags: :unknown_ok do
     @form = form_for_multi
-    multi_edit_slot
+    @within_multi_edit = true
+    edit_slot
   end
 
   def wrap_type_formgroup
@@ -78,40 +79,36 @@ format :html do
   end
 
   def edit_slot
-    if inline_nests_editor?
-      _render_core
-    elsif multi_edit?
-      process_nested_fields
-    else
-      single_card_edit_slot
+    case
+    when inline_nests_editor?  then _render_core
+    when multi_card_editor?    then multi_card_edit_fields
+    when in_multi_card_editor? then editor_in_multi_card
+    else                            single_card_edit_field
     end
   end
 
-  def multi_edit_slot
-    if inline_nests_editor?
-      _render_core
-    elsif multi_edit?
-      process_nested_fields
-    else
-      multi_card_edit_slot
-    end
+  # test: render nests within a normal rendering of the card's content? (as opposed to a standardized form)
+  def inline_nests_editor?
+    voo.editor == :inline_nests
   end
 
-  def multi_edit?
-    nests_editor? || # editor configured in voo
+  # test: are we opening a new multi-card form?
+  def multi_card_editor?
+    nests_editor? ||                         # editor configured in voo
       voo.structure || voo.edit_structure || # structure configured in voo
       card.structure                         # structure in card rule
   end
 
-  def inline_nests_editor?
-    voo.editor == :inline_nests
+  # test: are we already within a multi-card form?
+  def in_multi_card_editor?
+    @within_multi_edit.present?
   end
 
   def nests_editor?
     voo.editor == :nests
   end
 
-  def single_card_edit_slot
+  def single_card_edit_field
     if voo.show?(:type_formgroup) || voo.show?(:name_formgroup)
       # display content field in formgroup for consistency with other fields
       formgroup("", editor: :content, help: false) { content_field }
@@ -120,15 +117,15 @@ format :html do
     end
   end
 
-  def multi_card_edit_slot
+  def editor_in_multi_card
     add_junction_class
-    formgroup fancy_title(voo.title),
+    formgroup render_title,
               editor: "content", help: true, class: classy("card-editor") do
       [content_field, (form.hidden_field(:type_id) if card.new_card?)]
     end
   end
 
-  def process_nested_fields
+  def multi_card_edit_fields
     nested_fields_for_edit.map do |name, options|
       options[:hide] = [options[:hide], :toolbar].compact
       nest name, options
@@ -158,7 +155,7 @@ format :html do
   # then the subfield cards should be created on the new card not the existing
   # card that build the form
   def name_in_form
-    relative_names_in_form? ? card.relative_name : card.contextual_name
+    relative_names_in_form? ? card.relative_name : card.raw_name
   end
 
   def form
@@ -168,9 +165,9 @@ format :html do
   def card_form action, opts={}
     @form_root = true
     success = opts.delete(:success)
-    form_for card, card_form_opts(action, opts) do |form|
-      @form = form
-      success_tags(success) + output(yield(form))
+    form_for card, card_form_opts(action, opts) do |cform|
+      @form = cform
+      success_tags(success) + output(yield(cform))
     end
   end
 

data/mod/standard/set/all/rich_html/header.rb

@@ -1,7 +1,7 @@
 format :html do
   view :header do
     voo.hide :toggle, :toolbar
-    main_header + _optional_render_toolbar
+    main_header + _optional_render_toolbar.to_s.html_safe
   end
 
   def main_header

data/mod/standard/set/all/rich_html/new.rb

@@ -1,15 +1,17 @@
 format :html do
   view :new, perms: :create, tags: :unknown_ok, cache: :never do
-    voo.title ||= new_view_title if new_name_prompt?
-    voo.show :help
-    frame_and_form :create, new_form_opts do
-      [
-        new_view_hidden,
-        new_view_name,
-        new_view_type,
-        _optional_render_content_formgroup,
-        _optional_render_new_buttons
-      ]
+    with_nest_mode :edit do
+      voo.title ||= new_view_title if new_name_prompt?
+      voo.show :help
+      frame_and_form :create, new_form_opts do
+        [
+          new_view_hidden,
+          new_view_name,
+          new_view_type,
+          _optional_render_content_formgroup,
+          _optional_render_new_buttons
+        ]
+      end
     end
   end
 

data/mod/standard/set/all/rich_html/toolbar.rb

@@ -156,7 +156,7 @@ format :html do
   def related_codename related_card
     return nil unless related_card
     tag_card = Card.quick_fetch related_card.cardname.right
-    tag_card && tag_card.codename && tag_card.codename.to_sym
+    tag_card && tag_card.codename
   end
 
   def close_link extra_class, opts={}
@@ -165,7 +165,7 @@ format :html do
     wrap_with :div, class: css_classes do
       [
         # toolbar_pin_button,
-        link_to_view(voo.home_view, icon_tag(:remove),
+        link_to_view(voo.home_view || :open, icon_tag(:remove),
                      title: "cancel",
                      class: "btn-toolbar-control toolbar-close ml-3 p-0")
       ]

data/mod/standard/set/all/rich_html/wrapper.rb

@@ -53,15 +53,15 @@ format :html do
   end
 
   def debug_slot_wrap
-    pre = "<!--\n\n#{'  ' * @depth}"
+    pre = "<!--\n\n#{'  ' * depth}"
     post = " SLOT: #{h card.name}\n\n-->"
     [pre, "BEGIN", post, yield, pre, "END", post].join
   end
 
   def wrap_classes slot
-    list = ["card-slot", "#{@current_view}-view", card.safe_set_keys]
-    list.push "STRUCTURE-#{voo.structure.to_name.key}" if voo.structure
-    list.shift unless slot
+    list = slot ? ["card-slot"] : []
+    list += ["#{@current_view}-view", card.safe_set_keys]
+    list << "STRUCTURE-#{voo.structure.to_name.key}" if voo.structure
     classy list
   end
 

data/mod/standard/set/self/activity_toolbar_button.rb

@@ -1,7 +1,7 @@
 include_set Abstract::ToolbarSplitButton
 
 format :html do
-  view :core do
+  view :core, cache: :never do
     subject.toolbar_split_button "activity", view: :history, icon: :history do
       {
         history: (subject._render_history_link if card.history?),

data/mod/standard/set/self/recent.rb

@@ -22,13 +22,15 @@ format :html do
   view :recent_acts, cache: :never do
     acts = Act.all_viewable.order(id: :desc)
               .page(page_from_params).per(ACTS_PER_PAGE)
-    render_act_list acts: acts, act_context: :absolute
+    act_accordion acts do |act, act_seq|
+      act.card.format(:html).render_act act: act, act_seq: act_seq, act_context: :absolute
+    end
   end
 
   def act_paging
     acts = Act.all_viewable.order(id: :desc).page(page_from_params).per(ACTS_PER_PAGE)
     wrap_with :span, class: "slotter" do
-      paginate acts, remote: true, theme: "twitter-bootstrap-3"
+      paginate acts, remote: true, theme: "twitter-bootstrap-4"
     end
   end
 end

data/mod/standard/set/type/basic.rb

@@ -5,7 +5,7 @@ format :html do
   end
 
   def table_of_contents content
-    return if @mode == :closed || !content.present?
+    return if nest_mode == :closed || !content.present?
     min = card.rule(:table_of_contents).to_i
     # warn "table_of #{name}, #{min}"
     return unless min && min > 0
@@ -33,7 +33,7 @@ format :html do
 
     if toc.flatten.length >= min
       content.replace(
-        %( <div class="table-of-contents"> <h5>Table of Contents</h5> ) +
+        %( <div class="table-of-contents"> <h5>#{tr(:toc)}</h5> ) +
           make_table_of_contents_list(toc) + "</div>" + content
       )
     end

data/mod/standard/set/type/cardtype.rb

@@ -12,17 +12,14 @@ format :html do
 
   view :type_formgroup do |args|
     if card.cards_of_type_exist?
-      wrap_with :div do
-        "Sorry, this card must remain a Cardtype so long as " \
-        "there are <strong>#{card.name}</strong> cards."
-      end
+      wrap_with :div, tr(:cards_exist, cardname: card.name)
     else
       super args
     end
   end
 
   view :add_link do |args|
-    voo.title ||= "Add #{card.name}"
+    voo.title ||= tr(:add_card, cardname: card.name)
     title = _render_title args
     link_to title, path: _render_add_path(args), class: args[:css_class]
   end
@@ -41,8 +38,8 @@ format :html do
     if voo.params
       context = ((@parent && @parent.card) || card).name
       Rack::Utils.parse_nested_query(voo.params).each do |key, value|
-        value = value.to_name.to_absolute(context) if value
-        key = key.to_name.to_absolute(context)
+        value = value.to_name.absolute(context) if value
+        key = key.to_name.absolute(context)
         path_args[key] = value
       end
     end
@@ -76,6 +73,12 @@ end
 
 event :check_for_cards_of_type, after: :validate_delete do
   if cards_of_type_exist?
-    errors.add :cardtype, "can't alter this type; #{name} cards still exist"
+    errors.add :cardtype, tr(:cards_exist, name: name)
+  end
+end
+
+event :check_for_cards_of_type_when_type_changed, :validate, changed: :type do
+  if cards_of_type_exist?
+    errors.add :cardtype, tr(:error_cant_alter, name: name)
   end
 end