diff --git a/app/models/label_template.rb b/app/models/label_template.rb index 7a0c1bd9f..788b93dc4 100644 --- a/app/models/label_template.rb +++ b/app/models/label_template.rb @@ -40,7 +40,7 @@ class LabelTemplate < ApplicationRecord private def ensure_single_default_template! - if default && self.class.where(team_id: team_id, default: true, language_type: language_type) + if default && self.class.where(team_id: team_id, default: true, type: type) .where.not(id: id).any? errors.add(:default, I18n.t('activerecord.errors.models.label_template.attributes.default.already_exist')) end diff --git a/db/migrate/20220803122405_update_label_templates.rb b/db/migrate/20220803122405_update_label_templates.rb index 132847a3b..1177f1320 100644 --- a/db/migrate/20220803122405_update_label_templates.rb +++ b/db/migrate/20220803122405_update_label_templates.rb @@ -11,6 +11,8 @@ class UpdateLabelTemplates < ActiveRecord::Migration[6.1] t.remove :size end + LabelTemplate.reset_column_information + # Remove our original default template LabelTemplate.order(created_at: :asc).find_by(default: true)&.destroy @@ -21,7 +23,7 @@ class UpdateLabelTemplates < ActiveRecord::Migration[6.1] change_table :label_templates, bulk: true do |t| t.remove :type t.remove :width_mm - t.remoe :height_mm + t.remove :height_mm t.string :format, null: false, default: 'ZPL' t.integer :language_type t.string :size