issue 850 admin favorite bug fix. not use self auto_increment

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9809 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/admin/admin.admin.controller.php

@@ -276,10 +276,12 @@
 		/**
 		 * @brief Insert favorite
 		 **/
-		function _insertFavorite($siteSrl, $module)
+		function _insertFavorite($siteSrl, $module, $type = 'module')
 		{
+			$args->adminFavoriteSrl = getNextSequence();
 			$args->site_srl = $siteSrl;
 			$args->module = $module;
+			$args->type = $type;
 			$output = executeQuery('admin.insertFavorite', $args);
 			return $output;
 		}
@@ -294,6 +296,16 @@
 			return $output;
 		}
 
+		/**
+		 * @brief Delete favorite
+		 **/
+		function _deleteAllFavorite()
+		{
+			$args = null;
+			$output = executeQuery('admin.deleteAllFavorite', $args);
+			return $output;
+		}
+
 		function procAdminRemoveIcons(){
 			$iconname = Context::get('iconname');
 			$file_exist = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$iconname);

modules/admin/admin.class.php

@@ -19,6 +19,9 @@
          * @brief if update is necessary it returns true
          **/
         function checkUpdate() {
+            $oDB = &DB::getInstance();
+            if(!$oDB->isColumnExists("admin_favorite", "type")) return true;
+
             return false;
         }
 
@@ -27,6 +30,26 @@
          * @return new Object
          **/
         function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            if(!$oDB->isColumnExists("admin_favorite", "type"))
+			{
+				$oAdminAdminModel = &getAdminModel('admin');
+				$output = $oAdminAdminModel->getFavoriteList();
+				$favoriteList = $output->get('favoriteList');
+
+				$oDB->dropColumn('admin_favorite', 'admin_favorite_srl');
+            	$oDB->addColumn('admin_favorite',"admin_favorite_srl","number",11,0);
+				if(is_array($favoriteList))
+				{
+					$oAdminAdminController = &getAdminController('admin');
+					$oAdminAdminController->_deleteAllFavorite();
+					foreach($favoriteList AS $key=>$value)
+					{
+						$oAdminAdminController->_insertFavorite($value->site_srl, $value->module);
+					}
+				}
+            	$oDB->addColumn('admin_favorite',"type","varchar",30, 'module');
+			}
             return new Object();
         }
 

modules/admin/queries/insertFavorite.xml

@@ -3,7 +3,9 @@
 		<table name="admin_favorite" />
 	</tables>
 	<columns>
+		<column name="admin_favorite_srl" var="adminFavoriteSrl" filter="number" notnull="notnull" />
 		<column name="site_srl" var="site_srl" filter="number" notnull="notnull" />
 		<column name="module" var="module" notnull="notnull" />
+		<column name="type" var="favoriteType" default="module" />
 	</columns>
 </query>

modules/admin/schemas/admin_favorite.xml

@@ -2,4 +2,5 @@
 	<column name="admin_favorite_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" auto_increment="auto_increment" />
 	<column name="site_srl" type="number" size="11" default="0" />
 	<column name="module" type="varchar" size="80" />
+	<column name="type" type="varchar" size="30" />
 </table>