Merge 7893fec into 7a5ea37

wikirate · May 6, 2024 · b8d80c7 · b8d80c7
2 parents 7a5ea37 + 7893fec
commit b8d80c7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/mod/deckorate_datasets/set/abstract/dataset_search.rb b/mod/deckorate_datasets/set/abstract/dataset_search.rb
@@ -24,7 +24,7 @@ def default_sort_option
   end
 
   def filter_map
-    %i[name bookmark wikirate_topic]
+    %i[name wikirate_topic bookmark]
   end
 
   def default_filter_hash

diff --git a/mod/deckorate_profiles/set/type_plus_right/research_group/researcher.rb b/mod/deckorate_profiles/set/type_plus_right/research_group/researcher.rb
@@ -29,13 +29,11 @@ def ok_to_join?
 
 event :join_group, :validate, trigger: :required do
   abort :failure, "cannot join this group" unless ok_to_join?
-  add_item! Auth.current.name
-  abort :success
+  add_item Auth.current.name
 end
 
 event :leave_group, :validate, trigger: :required do
-  drop_item! Auth.current.name
-  abort :success
+  drop_item Auth.current.name
 end
 
 format do

diff --git a/vendor/card-mods b/vendor/card-mods
diff --git a/vendor/decko b/vendor/decko