From 6279d087a5095766e7961f35d773b4d155e30d93 Mon Sep 17 00:00:00 2001 From: Chris Nighswonger Date: Thu, 16 Apr 2015 12:07:29 -0400 Subject: [PATCH] Bug 10222: Error when saving Demco label templates This patch fixes a bug whereby if you open either of the Demco label templates (loaded by the sample data) and click "save" without making any changes you will get an error: Can't bless non-reference value at C4/Creators/Profile.pm line 92. It also fixes another minor bug in the creator sample data. To test: 1. Install all sample data in a clean database. 2. In the label tool, edit either of the Demco label templates. 3. Save the template and observe the error mentioned above. 4. Drop and recreate the database. 5. Apply the patch. 6. Repeate steps 1-3 and note the successful save. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens (cherry picked from commit d3eef921f501634d3656b9d08abafa55b3ed6c07) Signed-off-by: Fridolin Somers --- installer/data/mysql/en/optional/sample_creator_data.sql | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/en/optional/sample_creator_data.sql b/installer/data/mysql/en/optional/sample_creator_data.sql index 682eff9453..107800621a 100644 --- a/installer/data/mysql/en/optional/sample_creator_data.sql +++ b/installer/data/mysql/en/optional/sample_creator_data.sql @@ -22,7 +22,12 @@ INSERT INTO `creator_templates` VALUES (1,1,'Avery 5160 | 1 x 2-5/8','3 columns, UNLOCK TABLES; LOCK TABLES `printers_profile` WRITE; -INSERT INTO `printers_profile` VALUES (1,'Library Laser',1,'Bypass',-2,9,3,0,'POINT','Labels'),(11,'Library Laser',1,'Tray 1',0,0,0,0,'POINT','Labels'),(16,'Test Printer 01',23,'Test Bin',0,0,0,0,'POINT','Patroncards'); +INSERT INTO `printers_profile` ( profile_id, printer_name, template_id, paper_bin, offset_horz, offset_vert, creek_horz, creep_vert, units, creator ) VALUES +( 1,'Library Laser', 1,'Bypass', -2,9,3,0,'POINT','Labels'), +(13,'Library Laser', 7,'Tray 1', 0,0,0,0,'POINT','Labels'), +(14,'Library Laser', 12,'Tray 2', 0,0,0,0,'POINT','Labels'), +(16,'Test Printer 01',23,'Test Bin',0,0,0,0,'POINT','Patroncards'), +(22,'Library Laser', 0,'Tray 3', 0,0,0,0,'POINT','Labels'); UNLOCK TABLES; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -- 2.39.5