card 1.16.9 → 1.16.10

data/lib/card/set.rb

@@ -481,7 +481,7 @@ EOF
 
     def attachment name, args
       include Abstract::Attachment
-      set_specific_attributes name, :load_from_mod, :cached_upload,
+      set_specific_attributes name, :load_from_mod, :action_id_of_cached_upload,
                                     "remote_#{name}_url".to_sym
       uploader_class = args[:uploader] || FileUploader
       mount_uploader name, uploader_class

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

@@ -1,10 +1,10 @@
 ::Card.error_codes[:conflict] = [:conflict, 409]
 
 def content
-  db_content or (new_card? && template.db_content)
+  db_content || (new_card? && template.db_content)
 end
 
-def content=(value)
+def content= value
   self.db_content = value
 end
 
@@ -13,7 +13,7 @@ def raw_content
 end
 
 format do
-  def chunk_list #override to customize by set
+  def chunk_list # override to customize by set
     :default
   end
 end
@@ -23,11 +23,11 @@ def label
 end
 
 def creator
-  Card[ creator_id ]
+  Card[creator_id]
 end
 
 def updater
-  Card[ updater_id ]
+  Card[updater_id]
 end
 
 def clean_html?
@@ -38,25 +38,27 @@ def history?
   false
 end
 
-def save_content_draft content
+def save_content_draft _content
   clear_drafts
 end
 
 def clear_drafts
-  drafts.created_by(Card::Auth.current_id).each do |draft|
-    draft.delete
-  end
+  drafts.created_by(Card::Auth.current_id).each(&:delete)
+end
+
+def last_draft_content
+  drafts.last.card_changes.last.value
 end
 
-event :save_draft, before: :store, on: :update, when: proc{ |c| Env.params['draft'] == 'true' } do
+event :save_draft,
+      before: :store, on: :update,
+      when: proc { Env.params['draft'] == 'true' } do
   save_content_draft content
   abort :success
 end
 
-
 event :set_default_content, on: :create, before: :approve do
   if !db_content_changed? && template && template.db_content.present?
     self.db_content = template.db_content
   end
 end
-

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

@@ -41,7 +41,7 @@ $.extend wagn,
     # for file as a subcard in a form,
     # excess parameters are inlcuded in the request which cause errors.
     # only the file, type_id and attachment_card_name are needed
-    # attachment_card_name is the original card name, 
+    # attachment_card_name is the original card name,
     # ex: card[subcards][+logo][image], card[file]
     $(fileupload).bind 'fileuploadsubmit', (e,data) ->
       $_this = $(this)

data/mod/05_standard/set/abstract/attachment.rb

@@ -24,7 +24,7 @@ event :upload_attachment, before: :validate_name, on: :save, when: proc { |c| c.
 end
 
 event :assign_attachment_on_create, after: :prepare, on: :create, when: proc { |c| c.save_preliminary_upload? } do
-  if (action = Card::Action.fetch(@cached_upload))
+  if (action = Card::Action.fetch(@action_id_of_cached_upload))
     upload_cache_card.selected_action_id = action.id
     upload_cache_card.select_file_revision
     assign_attachment upload_cache_card.attachment.file, action.comment
@@ -33,7 +33,7 @@ end
 
 event :assign_attachment_on_update, after: :prepare, on: :update,
       when:  proc { |c| c.save_preliminary_upload? } do
-  if (action = Card::Action.fetch(@cached_upload))
+  if (action = Card::Action.fetch(@action_id_of_cached_upload))
     uploaded_file =
        with_selected_action_id(action.id) do
          attachment.file
@@ -62,7 +62,7 @@ event :save_original_filename, after: :validate_name, when: proc {|c| !c.prelimi
 end
 
 event :delete_cached_upload_file_on_create, after: :extend, on: :create, when: proc { |c| c.save_preliminary_upload? } do
-  if (action = Card::Action.fetch(@cached_upload))
+  if (action = Card::Action.fetch(@action_id_of_cached_upload))
     upload_cache_card.delete_files_for_action action
     action.delete
   end
@@ -70,7 +70,7 @@ event :delete_cached_upload_file_on_create, after: :extend, on: :create, when: p
 end
 
 event :delete_cached_upload_file_on_update, after: :extend, on: :update, when: proc { |c| c.save_preliminary_upload? } do
-  if (action = Card::Action.fetch(@cached_upload))
+  if (action = Card::Action.fetch(@action_id_of_cached_upload))
     delete_files_for_action action
     action.delete
   end
@@ -99,7 +99,7 @@ def preliminary_upload?
 end
 
 def save_preliminary_upload?
-  @cached_upload.present?
+  @action_id_of_cached_upload.present?
 end
 
 def attachment_changed?
@@ -116,12 +116,12 @@ def upload_cache_card
 end
 
 # action id of the cached upload
-def cached_upload= value
-  @cached_upload = value
+def action_id_of_cached_upload= value
+  @action_id_of_cached_upload = value
 end
 
-def cached_upload
-  @cached_upload
+def action_id_of_cached_upload
+  @action_id_of_cached_upload
 end
 
 def load_from_mod= value

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

@@ -3,15 +3,14 @@ def show_comment_box_in_related?
 end
 
 format :html do
-
   def show view, args
     if show_layout?
       args.merge! view: view if view
       @main_opts = args
-      self.render :layout
+      render :layout
     else
       view ||= args[:home_view] || :open
-      @inclusion_opts = args.delete(:items)
+      @inclusion_opts = (args[:items] || {}).clone
       render view, args
     end
   end
@@ -22,17 +21,17 @@ format :html do
 
   view :layout, perms: :none do |args|
     output [
-      process_content(get_layout_content, content_opts: { chunk_list: :references }),
+      process_content(get_layout_content, content_opts:
+        { chunk_list: :references }),
       _render_modal_slot(args)
     ]
   end
 
-
   view :content do |args|
     wrap args.reverse_merge(slot_class: 'card-content') do
       [
-        _optional_render( :menu, args, :hide ),
-        _render_core( args )
+        _optional_render(:menu, args, :hide),
+        _render_core(args)
       ]
     end
   end
@@ -41,9 +40,9 @@ format :html do
     wrap args.reverse_merge(slot_class: 'card-content panel panel-default') do
       wrap_with :div, class: 'panel-body' do
         [
-          _optional_render( :menu, args, :hide ),
-          _render_core( args )
-          ]*"\n"
+          _optional_render(:menu, args, :hide),
+          _render_core(args)
+        ] * "\n"
       end
     end
   end
@@ -51,10 +50,10 @@ format :html do
   view :titled, tags: :comment do |args|
     wrap args do
       [
-        _optional_render( :menu, args ),
-        _render_header( args ),
-        wrap_body( content: true ) { _render_core args },
-        optional_render( :comment_box, args )
+        _optional_render(:menu, args),
+        _render_header(args),
+        wrap_body(content: true) { _render_core args },
+        optional_render(:comment_box, args)
       ]
     end
   end
@@ -62,9 +61,9 @@ format :html do
   view :labeled do |args|
     wrap args do
       [
-        _optional_render( :menu, args ),
-        "<label>#{ _render_title args }</label>",
-        wrap_body( body_class: 'closed-content', content: true ) do
+        _optional_render(:menu, args),
+        "<label>#{_render_title args}</label>",
+        wrap_body(body_class: 'closed-content', content: true) do
           _render_closed_content args
         end
       ]
@@ -73,23 +72,23 @@ format :html do
 
   view :title do |args|
     title = fancy_title args[:title], args[:title_class]
-    title =  _optional_render( :title_editable, args, :hide) ||
-             _optional_render( :title_link, args.merge( title_ready: title ), :hide ) ||
-             title
+    title =
+      _optional_render(:title_editable, args, :hide) ||
+      _optional_render(:title_link, args.merge(title_ready: title), :hide) ||
+      title
     add_name_context
     title
   end
 
   view :title_link do |args|
-    card_link card.cardname, text: ( args[:title_ready] || showname(args[:title]) )
+    title_text = args[:title_ready] || showname(args[:title])
+    card_link card.cardname, text: title_text
   end
 
-  view :type_info do |args|
-    %{
-      <span class="type-info pull-right">
-        #{card_link(card.type_name, text: "#{card.type_name}", class: 'navbar-link')}
-      </span>
-    }.html_safe
+  view :type_info do
+    link_args = { text: "#{card.type_name}", class: 'navbar-link' }
+    link = card_link card.type_name, link_args
+    %{<span class="type-info pull-right">#{link}</span>}.html_safe
   end
 
   view :title_editable do |args|
@@ -98,145 +97,158 @@ format :html do
     end
     res = links.shift
     links.each_with_index do |link, index|
-      res += card_link card.cardname.parts[0..index+1].join('+'), text: glyphicon('plus','header-icon')
+      name = card.cardname.parts[0..index + 1].join '+'
+      res += card_link name, text: glyphicon('plus', 'header-icon')
       res += link
     end
     res += ' '
-    res.concat view_link(glyphicon('edit','header-icon'),:edit_name, class: 'slotter', 'data-toggle'=>'tooltip', title: 'edit name')
-    res.concat _optional_render(:type_link,args,:show)
+    res.concat view_link(
+      glyphicon('edit', 'header-icon'),
+      :edit_name,
+      class: 'slotter', 'data-toggle' => 'tooltip', title: 'edit name'
+    )
+    res.concat _optional_render(:type_link, args, :show)
   end
 
   view :open, tags: :comment do |args|
     args[:optional_toggle] ||= main? ? :hide : :show
     frame args.merge(content: true) do
       [
-        _render_open_content( args ),
-        optional_render( :comment_box, args )
+        _render_open_content(args),
+        optional_render(:comment_box, args)
       ]
     end
   end
 
-
-
-=begin
-  view :anchor, perms: :none, tags: :unknown_ok do |args|
-    %{ <a id="#{card.cardname.url_key}" name="#{card.cardname.url_key}"></a> }
-  end
-=end
+  # view :anchor, perms: :none, tags: :unknown_ok do |args|
+  #   %{ <a id="#{card.cardname.url_key}" name="#{card.cardname.url_key}"></a> }
+  # end
 
   view :type do |args|
     klasses = ['cardtype']
-    klass = args[:type_class] and klasses << klass
+    klass = args[:type_class]
+    klasses << klass if klass
     card_link card.type_card.name, class: klasses
   end
 
   view :closed do |args|
-    frame args.reverse_merge(content: true, body_class: 'closed-content', toggle_mode: :close, optional_toggle: :show, optional_toolbar: :hide ) do
+    frame args.reverse_merge(
+      content: true,
+      body_class: 'closed-content',
+      toggle_mode: :close,
+      optional_toggle: :show,
+      optional_toolbar: :hide
+    ) do
       _optional_render :closed_content, args
     end
   end
 
-
   view :change do |args|
     args[:optional_title_link] = :show
     wrap args do
       [
-        _optional_render( :title, args       ),
-        _optional_render( :menu, args, :hide ),
-        _optional_render( :last_action, args )
+        _optional_render(:title, args),
+        _optional_render(:menu, args, :hide),
+        _optional_render(:last_action, args)
       ]
     end
   end
 
   def current_set_card
     set_name = params[:current_set]
-    set_name ||= "#{card.name}+*type" if card.known? && card.type_id==Card::CardtypeID
+    if card.known? && card.type_id == Card::CardtypeID
+      set_name ||= "#{card.name}+*type"
+    end
     set_name ||= "#{card.name}+*self"
     Card.fetch(set_name)
   end
 
-
   view :related do |args|
     if args[:related_card]
       frame args.merge(optional_toolbar: :show) do
-        nest( args[:related_card], args[:related_args])
+        nest(args[:related_card], args[:related_args])
       end
     end
   end
 
   def default_related_args args
-    if rparams = args[:related] || params[:related]
-      rcard = rparams[:card] || begin
-                rcardname = rparams[:name].to_name.to_absolute_name( card.cardname)
-                Card.fetch rcardname, new: {}
-              end
-
-      #subheader =  with_name_context(card.name) { showname rcard.name }
-      subheader =  with_name_context(card.name) { subformat(rcard)._render_title(args) }
-      add_name_context card.name
-      nest_args = ( rparams[:slot] || {} ).deep_symbolize_keys.reverse_merge(
-        view:            ( rparams[:view] || :open ),
-        optional_header: :hide,
-        optional_menu:   :show,
-        subheader:       subheader,
-        optional_toggle: :hide,
-        optional_help:   :show,
-        parent:          card,
-        subframe:        true,
-        subslot:         true
-      )
-      nest_args[:optional_comment_box] = :show if rcard.show_comment_box_in_related?
+    rparams = args[:related] || params[:related]
+    return unless rparams
+    rcard = rparams[:card] || begin
+      rcardname = rparams[:name].to_name.to_absolute_name(card.cardname)
+      Card.fetch rcardname, new: {}
+    end
 
-      args[:related_args] = nest_args
-      args[:related_card] = rcard
+    subheader =  with_name_context(card.name) do
+      subformat(rcard)._render_title(args)
     end
+    add_name_context card.name
+    nest_args = (rparams[:slot] || {}).deep_symbolize_keys.reverse_merge(
+      view:            (rparams[:view] || :open),
+      optional_header: :hide,
+      optional_menu:   :show,
+      subheader:       subheader,
+      optional_toggle: :hide,
+      optional_help:   :show,
+      parent:          card,
+      subframe:        true,
+      subslot:         true
+    )
+    if rcard.show_comment_box_in_related?
+      nest_args[:optional_comment_box] = :show
+    end
+    args[:related_args] = nest_args
+    args[:related_card] = rcard
   end
 
-
-
   view :help, tags: :unknown_ok do |args|
-    text = if args[:help_text]
-      args[:help_text]
-    else
-      setting = card.new_card? ? [ :add_help, { fallback: :help } ] : :help
-      if help_card = card.rule_card( *setting ) and help_card.ok? :read
+    text = args[:help_text] || begin
+      setting = card.new_card? ? [:add_help, { fallback: :help }] : :help
+      help_card = card.rule_card(*setting)
+      if help_card && help_card.ok?(:read)
         with_inclusion_mode :normal do
-          process_content _render_raw( args.merge structure: help_card.name ), content_opts: { chunk_list: :references }
-          # render help card with current card's format so current card's context is used in help card inclusions
+          raw_help_content = _render_raw args.merge(structure: help_card.name)
+          process_content raw_help_content, content_opts:
+            { chunk_list: :references }
+          # render help card with current card's format
+          # so current card's context is used in help card inclusions
         end
       end
     end
-    klass = [args[:help_class], 'help-text'].compact*' '
+    klass = [args[:help_class], 'help-text'].compact * ' '
     %{<div class="#{klass}">#{raw text}</div>} if text
   end
 
+  view :last_action do
+    act = card.last_act
+    return unless act
+    action = act.action_on card.id
+    return unless action
+    action_verb =
+      case action.action_type
+      when :create then 'added'
+      when :delete then 'deleted'
+      else
+        link_to(
+          'edited',
+          path(view: :history),
+          class: 'last-edited', rel: 'nofollow'
+        )
+      end
 
-  view :last_action do |args|
-    if act = card.last_act and action = act.action_on(card.id)
-      action_verb =
-        case action.action_type
-        when :create then 'added'
-        when :delete then 'deleted'
-        else
-          link_to('edited', path(view: :history), class: 'last-edited', rel: 'nofollow')
-        end
-
-      %{
-        <span class="last-update">
-          #{ action_verb }
-          #{ _render_acted_at }
-          ago by
-          #{ subformat(card.last_actor)._render_link }
-        </span>
-      }
-    end
+    %{
+      <span class="last-update">
+        #{action_verb} #{_render_acted_at} ago by
+        #{subformat(card.last_actor)._render_link}
+      </span>
+    }
   end
 
   private
 
   def fancy_title title=nil, title_class=nil
-    raw %{<span class="card-title#{" #{title_class}"if title_class}">#{ showname(title).to_name.parts.join %{<span class="joint">+</span>} }</span>}
+    klasses = ['card-title', title_class].compact * ' '
+    title = showname(title).to_name.parts.join %{<span class="joint">+</span>}
+    raw %{<span class="#{klasses}">#{title}</span>}
   end
 end
-
-