Bugfix. https://pm.cetera.ru/browse/CCD-1308

cetera-labs · Nov 30, 2018 · c81ef59 · c81ef59
1 parent c8f1b58
commit c81ef59
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,5 @@
+	* Bugfix. https://pm.cetera.ru/browse/CCD-1308
+
 3.58.4
 
 	* BackOffice. Улучшена работа сортировки порядка полей при редактировании типа материала

diff --git a/cms/include/action_types.php b/cms/include/action_types.php
@@ -249,7 +249,7 @@
 		list($type_id) = $application->getConn()->fetchArray('select id from types_fields where field_id=?', array($_REQUEST['id']));
 		$count = $application->getConn()->fetchColumn('select count(tag) as c from types_fields where id=? group by tag having c>1', [$type_id]);
 		if ($count) {
-			$application->getConn()->executeQuery('SET @v := 10; UPDATE `types_fields` SET tag = (@v := @v + 10) WHERE id = ? ORDER BY TAG', [$type_id]);
+			$application->getConn()->executeQuery('SET @v := 0; UPDATE `types_fields` SET tag = (@v := @v + 10) WHERE id = ? ORDER BY TAG', [$type_id]);
 		}
 	}
 

diff --git a/cms/include/classes/Cetera/Schema.php b/cms/include/classes/Cetera/Schema.php
@@ -880,8 +880,10 @@ public function parseSchema($module) {
     		if ($value['tag'] == 'key') {
     		    if ($value['type'] == 'open') $key = $value['attributes'];
     			if ($value['type'] == 'close') {
-    				if (!isset($table['keys'])) $table['keys'] = array();	
-    				$table['keys'][$key['name']] = $key;
+					if ($key['name']) {
+						if (!isset($table['keys'])) $table['keys'] = array();	
+						$table['keys'][$key['name']] = $key;
+					}
     			}
     		}
 

diff --git a/cms/include/data_theme.php b/cms/include/data_theme.php
@@ -26,6 +26,10 @@
         $theme->setConfig($r->config, $s);       
 
     }
+
+    echo json_encode(array(
+        'success' => true
+    ));		
 
 } else {