card 1.15.3 → 1.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 035ff8a2c3e11faad9581ec2fd64be55f16e818c
-  data.tar.gz: 651477978a4542938c382b06bdf22bc8b9d0d11f
+  metadata.gz: 4dc15d9c2c0968a351432221cb47274d695515c9
+  data.tar.gz: 006311ea9e42182b47adc6e3a1ed434e47239c54
 SHA512:
-  metadata.gz: 124d599852883b45e3fab2667dcd0e993d2f5ca58a8bae4ca97e4699d9a1b57b6b849b694f868e0dbb07d542bf0343916e6b093658cb6d0c6891d0d04a3f37c2
-  data.tar.gz: a99c73da160d7cb3b905667fda01bbbb91250d7da656179ea5daad377a16cd262db755bea0fda9ac7db5597bac1c51f36a6c6eda4ee01ed45b8c157562e2e34d
+  metadata.gz: 897cf06f078a5deef931ec1b38d70c1690b3f97943f58987789e33c1dbea8a9d46b89c53d123196b35cb00b8b05d7c92c2fa3c8b6d6718de1863ee7f2276f217
+  data.tar.gz: a9e1cd1a88f3da9b79b9b3b011d48e5ea64650b4e5f35945e263cd5bdc8fc14563c6f463c5acaed93f30d03a46bd01b0345e8bb076f5423845b31cc8bfa538fa

data/VERSION

@@ -1 +1 @@
-1.15.3
+1.15.4

data/db/migrate_core_cards/20150528084659_add_session_cardtype.rb

@@ -2,7 +2,8 @@
 
 class AddSessionCardtype < Card::CoreMigration
   def up
-    Card.create! :name=>'Session', :type_code=>:cardtype, :codename=>'session',
+    session_card_name = Card.exists?( 'Session' ) ? 'BrowserSession' : 'Session'
+    Card.create! :name=>session_card_name, :type_code=>:cardtype, :codename=>'session',
                 :subcards=>{'+description'=>{:content=>'Session cards are for non-permanent content.
                   They are not stored in the database and can have different values for different users.
                   You can use a Session card to keep track of certain state of a particular user like the content

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

@@ -176,7 +176,7 @@ format :html do
     end
     tab_panel tab_buttons, tab_panes, args[:tab_type]
   end
-  def default_tab_args args
+  def default_tabs_args args
     args[:tab_type] ||= 'tabs'
   end
 
@@ -215,7 +215,7 @@ format :html do
   end
 
   def tab_button target, text, active=false, link_attr={}
-    link = link_to text, target, link_attr.merge('role'=>'tab','data-toggle'=>'tab')
+    link = link_to fancy_title(text), target, link_attr.merge('role'=>'tab','data-toggle'=>'tab')
     li_args = { :role => :presentation }
     li_args[:class] = 'active' if active
     content_tag :li, link, li_args

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

@@ -5,12 +5,12 @@ def select_action_by_params params
 end
 
 def find_action_by_params args
-  case 
+  case
   when args[:rev]
     nth_action args[:rev]
   when args[:rev_id]
-    if action = Action.fetch(args[:rev_id]) and action.card_id == id 
-      action 
+    if action = Action.fetch(args[:rev_id]) and action.card_id == id
+      action
     end
   end
 end
@@ -37,7 +37,7 @@ end
 def delete_old_actions
   Card::TRACKED_FIELDS.each do |field|
     # assign previous changes on each tracked field to the last action
-    if (not last_action.change_for(field).present?) and (last_change = last_change_on(field))
+    if (la=last_action) && !la.change_for(field).present? && (last_change = last_change_on(field))
       last_change = Card::Change.find(last_change.id)   # last_change comes as readonly record
       last_change.update_attributes!(:card_action_id=>last_action_id)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.15.3
+  version: 1.15.4
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: smartname