fixes #2114 - delete and clone messages are overly escaped

Author: tabacitu

CHANGELOG.md

@@ -7,6 +7,13 @@ All Notable changes to `Backpack CRUD` will be documented in this file.
 # Backpack Version 4
 
 -----------
+
+## 4.0.7 - 2019-10-xx
+
+### Fixed
+- fixes #2114 - delete and clone message texts are overly escaped;
+
+
 ## 4.0.6 - 2019-10-04
 
 ### Fixed

src/resources/views/crud/buttons/bulk_clone.blade.php

@@ -11,7 +11,7 @@ function bulkCloneEntries(button) {
 	      {
   	        new Noty({
 	          type: "warning",
-	          text: "<strong>{{ trans('backpack::crud.bulk_no_entries_selected_title') }}</strong><br>{{ trans('backpack::crud.bulk_no_entries_selected_message') }}"
+	          text: "<strong>{!! trans('backpack::crud.bulk_no_entries_selected_title') !!}</strong><br>{!! trans('backpack::crud.bulk_no_entries_selected_message') !!}"
 	        }).show();
 
 	      	return;
@@ -22,12 +22,12 @@ function bulkCloneEntries(button) {
 
 	      // show confirm message
 	      swal({
-			  title: "{{ trans('backpack::base.warning') }}",
+			  title: "{!! trans('backpack::base.warning') !!}",
 			  text: message,
 			  icon: "warning",
 			  buttons: {
 			  	cancel: {
-				  text: "{{ trans('backpack::crud.cancel') }}",
+				  text: "{!! trans('backpack::crud.cancel') !!}",
 				  value: null,
 				  visible: true,
 				  className: "bg-secondary",

src/resources/views/crud/buttons/bulk_delete.blade.php

@@ -11,30 +11,30 @@ function bulkDeleteEntries(button) {
 	      {
 	      	new Noty({
 	          type: "warning",
-	          text: "<strong>{{ trans('backpack::crud.bulk_no_entries_selected_title') }}</strong><br>{{ trans('backpack::crud.bulk_no_entries_selected_message') }}"
+	          text: "<strong>{!! trans('backpack::crud.bulk_no_entries_selected_title') !!}</strong><br>{!! trans('backpack::crud.bulk_no_entries_selected_message') !!}"
 	        }).show();
 
 	      	return;
 	      }
 
-	      var message = ("{{ trans('backpack::crud.bulk_delete_are_you_sure') }}").replace(":number", crud.checkedItems.length);
+	      var message = ("{!! trans('backpack::crud.bulk_delete_are_you_sure') !!}").replace(":number", crud.checkedItems.length);
 	      var button = $(this);
 
 	      // show confirm message
 	      swal({
-			  title: "{{ trans('backpack::base.warning') }}",
+			  title: "{!! trans('backpack::base.warning') !!}",
 			  text: message,
 			  icon: "warning",
 			  buttons: {
 			  	cancel: {
-				  text: "{{ trans('backpack::crud.cancel') }}",
+				  text: "{!! trans('backpack::crud.cancel') !!}",
 				  value: null,
 				  visible: true,
 				  className: "bg-secondary",
 				  closeModal: true,
 				},
 			  	delete: {
-				  text: "{{ trans('backpack::crud.delete') }}",
+				  text: "{!! trans('backpack::crud.delete') !!}",
 				  value: true,
 				  visible: true,
 				  className: "bg-danger",
@@ -54,7 +54,7 @@ className: "bg-danger",
 						    // Show an alert with the result
 							new Noty({
 								type: "success",
-								text: "<strong>{{ trans('backpack::crud.bulk_delete_sucess_title') }}</strong><br>"+crud.checkedItems.length+"{{ trans('backpack::crud.bulk_delete_sucess_message') }}"
+								text: "<strong>{!! trans('backpack::crud.bulk_delete_sucess_title') !!}</strong><br>"+crud.checkedItems.length+"{!! trans('backpack::crud.bulk_delete_sucess_message') !!}"
 							}).show();
 
 						  	crud.checkedItems = [];
@@ -64,7 +64,7 @@ className: "bg-danger",
 							// Show an alert with the result
 							new Noty({
 								type: "warning",
-								text: "<strong>{{ trans('backpack::crud.bulk_delete_error_title') }}</strong><br>{{ trans('backpack::crud.bulk_delete_error_message') }}"
+								text: "<strong>{!! trans('backpack::crud.bulk_delete_error_title') !!}</strong><br>{!! trans('backpack::crud.bulk_delete_error_message') !!}"
 							}).show();
 						}
 					});

src/resources/views/crud/buttons/delete.blade.php

@@ -19,19 +19,19 @@ function deleteEntry(button) {
 		var row = $("#crudTable a[data-route='"+route+"']").closest('tr');
 
 		swal({
-		  title: "{{ trans('backpack::base.warning') }}",
-		  text: "{{ trans('backpack::crud.delete_confirm') }}",
+		  title: "{!! trans('backpack::base.warning') !!}",
+		  text: "{!! trans('backpack::crud.delete_confirm') !!}",
 		  icon: "warning",
 		  buttons: {
 		  	cancel: {
-			  text: "{{ trans('backpack::crud.cancel') }}",
+			  text: "{!! trans('backpack::crud.cancel') !!}",
 			  value: null,
 			  visible: true,
 			  className: "bg-secondary",
 			  closeModal: true,
 			},
 		  	delete: {
-			  text: "{{ trans('backpack::crud.delete') }}",
+			  text: "{!! trans('backpack::crud.delete') !!}",
 			  value: true,
 			  visible: true,
 			  className: "bg-danger",
@@ -46,17 +46,17 @@ className: "bg-danger",
 			          if (result != 1) {
 			          	// Show an error alert
 			              swal({
-			              	title: "{{ trans('backpack::crud.delete_confirmation_not_title') }}",
-			              	text: "{{ trans('backpack::crud.delete_confirmation_not_message') }}",
+			              	title: "{!! trans('backpack::crud.delete_confirmation_not_title') !!}",
+			              	text: "{!! trans('backpack::crud.delete_confirmation_not_message') !!}",
 			              	icon: "error",
 			              	timer: 2000,
 			              	buttons: false,
 			              });
 			          } else {
 			          	  // Show a success message
 			              swal({
-			              	title: "{{ trans('backpack::crud.delete_confirmation_title') }}",
-			              	text: "{{ trans('backpack::crud.delete_confirmation_message') }}",
+			              	title: "{!! trans('backpack::crud.delete_confirmation_title') !!}",
+			              	text: "{!! trans('backpack::crud.delete_confirmation_message') !!}",
 			              	icon: "success",
 			              	timer: 4000,
 			              	buttons: false,
@@ -77,8 +77,8 @@ className: "bg-danger",
 			      error: function(result) {
 			          // Show an alert with the result
 			          swal({
-		              	title: "{{ trans('backpack::crud.delete_confirmation_not_title') }}",
-		              	text: "{{ trans('backpack::crud.delete_confirmation_not_message') }}",
+		              	title: "{!! trans('backpack::crud.delete_confirmation_not_title') !!}",
+		              	text: "{!! trans('backpack::crud.delete_confirmation_not_message') !!}",
 		              	icon: "error",
 		              	timer: 4000,
 		              	buttons: false,