bullet_train 1.4.6 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a965daba64c07c54a925adad5ca51fcfd30496790e350d2846de6c864fda65
-  data.tar.gz: 4c0fbeabceb820a417340e8d27a588ece5482622db32016b74b504989bbbb7b1
+  metadata.gz: 86b25cd3f8b935ed66013d2f4f906a58f50445a1d0250fc92f661d96478c9798
+  data.tar.gz: 2020c0ee2cc8d7e14f96f4ff00976729227b434d0c94ba216e8eeeb2ab93c6df
 SHA512:
-  metadata.gz: da6e96885f39b697c2bb1e6b4a80fbd3532ca174b2b807d8b17d31882764b26131fa03457d31b4dd02471ceaa4724f12b841fb752ae3eecbcc809cccff5b8c10
-  data.tar.gz: 638389f69f535a1bfd49fe4ded96026dc83b7f444d449b1e69be9a8b78b9ea0f633a9b4020d0734424d56a8c93e01af70bcf4ae4894d5fa423475b235621bb71
+  metadata.gz: 75b39744eeffb426ad00c56dc257ab48f3039914f4372093ea49b2a50ec7ec64fac89876f5e0e4856fb179273ba7949f472699147d9a9d8cc01ae0c101304b1c
+  data.tar.gz: 1f4ed96750b8261f799f7aff62e64356360319039a71292f18ac51e004de902e8d40cea5dea28c6ce1bc6a3d8dd345564841132bf3a19e6322fa918ee0f7a517

data/app/controllers/concerns/account/teams/controller_base.rb

@@ -110,13 +110,17 @@ module Account::Teams::ControllerBase
 
   # # DELETE /teams/1
   # # DELETE /teams/1.json
-  # def destroy
-  #   @team.destroy
-  #   respond_to do |format|
-  #     format.html { redirect_to account_teams_url, notice: 'Team was successfully destroyed.' }
-  #     format.json { head :no_content }
-  #   end
-  # end
+  def destroy
+    respond_to do |format|
+      raise RemovingLastTeamException if current_user.one_team?
+      @team.destroy
+      format.html { redirect_to account_teams_url, notice: t("account.teams.notifications.destroyed") }
+      format.json { head :no_content }
+    rescue RemovingLastTeamException => _
+      format.html { redirect_to edit_account_team_url(@team), alert: t("account.teams.notifications.cannot_delete_last_team") }
+      format.json { head :no_content }
+    end
+  end
 
   private
 

data/app/models/concerns/teams/base.rb

@@ -7,6 +7,10 @@ module Teams::Base
       has_many :scaffolding_absolutely_abstract_creative_concepts, class_name: "Scaffolding::AbsolutelyAbstract::CreativeConcept", dependent: :destroy, enable_cable_ready_updates: true
     end
 
+    # added_by_id is a foreign_key to other Memberships on the same team,
+    # so we nullify this to remove the constraint to delete the team.
+    before_destroy { Membership.where(team: self).update_all(added_by_id: nil) }
+
     # memberships and invitations
     has_many :memberships, dependent: :destroy
     has_many :users, through: :memberships

data/app/views/account/teams/_form.html.erb

@@ -17,6 +17,9 @@
 
   <div class="buttons">
     <%= form.submit (form.object.persisted? ? t('.buttons.update') : t('.buttons.create')), class: "button" %>
+    <% if controller.action_name == "edit" %>
+      <%= link_to t('account.teams.buttons.destroy'), [:account, team], method: :delete, data: { confirm: t('account.teams.buttons.confirmations.destroy') } %>
+    <% end %>
     <%= link_to t('global.buttons.cancel'), form.object.persisted? ? [:account, team] : [:account, :teams], class: "button-secondary" %>
   </div>
 <% end %>

data/config/locales/en/teams.en.yml

@@ -13,6 +13,9 @@ en:
       create: Create Team
       edit: Edit Team
       update: Update Team
+      destroy: Delete Team
+      confirmations:
+        destroy: Are you sure you want to delete this team?
     index:
       section: Teams
       header: Your Teams
@@ -40,7 +43,9 @@ en:
     notifications:
       created: Team was successfully created.
       updated: Team was successfully updated.
+      destroyed: Team was successfully destroyed.
       invitation_only: Creating new teams is currently limited to users who have been invited for early access. If you've received an early access URL, please visit it before trying again.
+      cannot_delete_last_team: You cannot delete the last team you belong to.
     form:
       buttons: *buttons
     fields: &fields

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.4.6"
+  VERSION = "1.4.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.8
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard