Ticket #947

modules/boonex/english/data/langs/system/en.xml

@@ -1321,6 +1321,7 @@
 	<string name="_adm_stg_scs_save"><![CDATA[Settings were successfully saved]]></string>
 	<string name="_adm_stg_err_save_error_message"><![CDATA[Error in '{0}': {1}]]></string>
 	<string name="_adm_stg_err_cannot_perform"><![CDATA[Cannot perform the action.]]></string>
+	<string name="_adm_stg_err_mix_already_exists"><![CDATA[Mix with the same name already exists.]]></string>
 	<string name="_adm_stg_txt_create_mix_popup"><![CDATA[Add New Mix]]></string>
 	<string name="_adm_stg_txt_import_mix_popup"><![CDATA[Import Mix]]></string>
 	<string name="_adm_stg_txt_mix_duplicate"><![CDATA[Duplicate from]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -1319,6 +1319,7 @@
 	<string name="_adm_stg_scs_save"><![CDATA[Настройки удачно сохранены]]></string>
 	<string name="_adm_stg_err_save_error_message"><![CDATA[Ошибка в '{0}': {1}]]></string>
 	<string name="_adm_stg_err_cannot_perform"><![CDATA[Не могу выполнить действие.]]></string>
+	<string name="_adm_stg_err_mix_already_exists"><![CDATA[Набор с таким именем уже существует.]]></string>
 	<string name="_adm_stg_txt_create_mix_popup"><![CDATA[Добавить новый набор]]></string>
 	<string name="_adm_stg_txt_import_mix_popup"><![CDATA[Импортировать набор]]></string>
 	<string name="_adm_stg_txt_mix_duplicate"><![CDATA[Продублировать]]></string>

studio/js/settings.js

@@ -174,7 +174,9 @@ BxDolStudioSettings.prototype.processResult = function(oData) {
 	var $this = this;
 
 	if(oData && oData.message != undefined && oData.message.length != 0)
-    	alert(oData.message);
+		$(document).dolPopupAlert({
+			message: oData.message
+		});
 
     if(oData && oData.reload != undefined && parseInt(oData.reload) == 1)
     	document.location = document.location;

studio/template/scripts/BxBaseStudioSettings.php

@@ -445,6 +445,11 @@ class BxBaseStudioSettings extends BxDolStudioSettings
 			if(!is_array($aContent) || empty($aContent['mix']) || empty($aContent['options']))
 				return array('code' => '3', 'message' => $sError);
 
+            $aMix = array();
+            $this->oDb->getMixes(array('type' => 'by_name', 'value' => $aContent['mix']['name']), $aMix, false);
+            if(!empty($aMix) && is_array($aMix))
+                return array('code' => '4', 'message' => _t('_adm_stg_err_mix_already_exists'));
+
         	$iId = $oForm->insert(array(
         		'type' => $aContent['mix']['type'],
         		'category' => $aContent['mix']['category'],
@@ -452,7 +457,7 @@ class BxBaseStudioSettings extends BxDolStudioSettings
         		'title' => $aContent['mix']['title']
         	));
         	if($iId === false)
-	        	return array('code' => '4', 'message' => $sError); 
+	        	return array('code' => '5', 'message' => $sError); 
 
 			foreach($aContent['options'] as $sKey => $sValue)
 				$this->oDb->insertMixesOptions(array(