From 0de9c3ac6c1231617877ec19b187704053cfbff1 Mon Sep 17 00:00:00 2001
From: PhpMadman <bjorn@nldistribution.se>
Date: Tue, 3 Dec 2013 10:57:25 +0100
Subject: [PATCH] [*] BO : Added option to always rewrite friendly url of
 product

---
 .../template/controllers/products/informations.tpl        | 7 ++++++-
 controllers/admin/AdminPPreferencesController.php         | 8 ++++++++
 controllers/admin/AdminProductsController.php             | 4 +++-
 js/admin.js                                               | 2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index d79980354..efec743e7 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -32,6 +32,11 @@
 	<input type="hidden" name="submitted_tabs[]" value="Informations" />
 	<h3 class="tab">{l s='Information'}</h3>
 	<script type="text/javascript">
+		{if isset($ps_force_friendly_product) && $ps_force_friendly_product}
+			var ps_force_friendly_product = 1;
+		{else}
+			var ps_force_friendly_product = 0;
+		{/if}
 		{if isset($PS_ALLOW_ACCENTED_CHARS_URL) && $PS_ALLOW_ACCENTED_CHARS_URL}
 			var PS_ALLOW_ACCENTED_CHARS_URL = 1;
 		{else}
@@ -131,7 +136,7 @@
 		<div class="col-lg-5">
 			{include file="controllers/products/input_text_lang.tpl"
 				languages=$languages
-				input_class="{$class_input_ajax}{if !$product->id}copy2friendlyUrl{/if} updateCurrentText"
+				input_class="{$class_input_ajax}{if !$product->id || Configuration::get('PS_FORCE_FRIENDLY_PRODUCT')}copy2friendlyUrl{/if} updateCurrentText"
 				input_value=$product->name
 				input_name="name"
 			}
diff --git a/controllers/admin/AdminPPreferencesController.php b/controllers/admin/AdminPPreferencesController.php
index f250b0798..f1f3c010d 100644
--- a/controllers/admin/AdminPPreferencesController.php
+++ b/controllers/admin/AdminPPreferencesController.php
@@ -93,6 +93,14 @@ class AdminPPreferencesControllerCore extends AdminController
 							0 => $this->l('Products:'),
 							1 => $this->l('Combinations')
 						)
+					),
+					'PS_FORCE_FRIENDLY_PRODUCT' => array(
+						'title' => $this->l('Force update of friendly url'),
+						'hint' => $this->l('When active, friendly url will be updated on every save'),
+						'validation' => 'isBool',
+						'cast' => 'intval',
+						'required' => false,
+						'type' => 'bool'
 					)
 				),
 			),
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 539eb5621..a6d8d4723 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2577,6 +2577,8 @@ class AdminProductsControllerCore extends AdminController
 		$this->tpl_form_vars['post_data'] = Tools::jsonEncode($_POST);
 		$this->tpl_form_vars['save_error'] = !empty($this->errors);
 
+		$this->tpl_form_vars['ps_force_friendly_product'] = Configuration::get('PS_FORCE_FRIENDLY_PRODUCT');
+
 		// autoload rich text editor (tiny mce)
 		$this->tpl_form_vars['tinymce'] = true;
 		$iso = $this->context->language->iso_code;
@@ -3576,7 +3578,7 @@ class AdminProductsControllerCore extends AdminController
 			$product->$prop = $this->getFieldValue($product, $prop);
 
 		$product->name['class'] = 'updateCurrentText';
-		if (!$product->id)
+		if (!$product->id || Configuration::get('PS_FORCE_FRIENDLY_PRODUCT'))
 			$product->name['class'] .= ' copy2friendlyUrl';
 
 		$images = Image::getImages($this->context->language->id, $product->id);
diff --git a/js/admin.js b/js/admin.js
index 40ae1be5e..5a7264374 100644
--- a/js/admin.js
+++ b/js/admin.js
@@ -136,7 +136,7 @@ function copy2friendlyURL()
 	if (typeof(id_product) == 'undefined')
 		id_product = false;
 	
-	if (!$('#link_rewrite_' + id_language).val().length || !id_product)//check if user didn't type anything in rewrite field, to prevent overwriting
+	if (ps_force_friendly_product || !$('#link_rewrite_' + id_language).val().length || !id_product)//check if user didn't type anything in rewrite field, to prevent overwriting
 	{
 		$('#link_rewrite_' + id_language).val(str2url($('#name_' + id_language).val().replace(/^[0-9]+\./, ''), 'UTF-8').replace('%', ''));
 		if ($('#friendly-url'))