diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php index 3a50d3013..e6e23d751 100644 --- a/modules/autoinstall/autoinstall.admin.view.php +++ b/modules/autoinstall/autoinstall.admin.view.php @@ -8,6 +8,7 @@ class autoinstallAdminView extends autoinstall { + var $categories; function init() { $template_path = sprintf("%stpl/",$this->module_path); @@ -181,7 +182,7 @@ $oModel = &getModel('autoinstall'); $item = $oModel->getLatestPackage(); - if(!$item || $item->updatedate < $updateDate ) + if(!$item || $item->updatedate < $updateDate || count($this->categories) < 1) { Context::set('need_update', true); return; @@ -231,8 +232,8 @@ function dispCategory() { $oModel = &getModel('autoinstall'); - $categories = &$oModel->getCategoryList(); - Context::set('categories', $categories); + $this->categories = &$oModel->getCategoryList(); + Context::set('categories', $this->categories); } } ?> diff --git a/modules/autoinstall/autoinstall.class.php b/modules/autoinstall/autoinstall.class.php index 221de96b9..1df1ead74 100644 --- a/modules/autoinstall/autoinstall.class.php +++ b/modules/autoinstall/autoinstall.class.php @@ -45,6 +45,16 @@ * @brief 설치가 이상이 없는지 체크하는 method **/ function checkUpdate() { + $oDB =& DB::getInstance(); + if($oDB->isTableExists("autoinstall_installed_packages")) + { + return true; + } + if($oDB->isTableExists("autoinstall_remote_categories")) + { + return true; + } + return false; } @@ -52,6 +62,15 @@ * @brief 업데이트 실행 **/ function moduleUpdate() { + $oDB =& DB::getInstance(); + if($oDB->isTableExists("autoinstall_installed_packages")) + { + $oDB->dropTable("autoinstall_installed_packages"); + } + if($oDB->isTableExists("autoinstall_remote_categories")) + { + $oDB->dropTable("autoinstall_remote_categories"); + } return new Object(0, 'success_updated'); } diff --git a/modules/autoinstall/queries/deleteCategory.xml b/modules/autoinstall/queries/deleteCategory.xml index f0cbea6d6..a1785b31e 100644 --- a/modules/autoinstall/queries/deleteCategory.xml +++ b/modules/autoinstall/queries/deleteCategory.xml @@ -1,6 +1,6 @@ - +
diff --git a/modules/autoinstall/queries/deleteInstalledPackage.xml b/modules/autoinstall/queries/deleteInstalledPackage.xml index feb3cc3df..965a6c838 100644 --- a/modules/autoinstall/queries/deleteInstalledPackage.xml +++ b/modules/autoinstall/queries/deleteInstalledPackage.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/queries/getCategories.xml b/modules/autoinstall/queries/getCategories.xml index be66b8c1e..8c680a7b3 100644 --- a/modules/autoinstall/queries/getCategories.xml +++ b/modules/autoinstall/queries/getCategories.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/queries/getCategory.xml b/modules/autoinstall/queries/getCategory.xml index 99d8e7275..0a37238c9 100644 --- a/modules/autoinstall/queries/getCategory.xml +++ b/modules/autoinstall/queries/getCategory.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/queries/getInstalledPackage.xml b/modules/autoinstall/queries/getInstalledPackage.xml index 4c2680c49..9fe879955 100644 --- a/modules/autoinstall/queries/getInstalledPackage.xml +++ b/modules/autoinstall/queries/getInstalledPackage.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/queries/getInstalledPackageCount.xml b/modules/autoinstall/queries/getInstalledPackageCount.xml index 0c8fea6a5..2eed39470 100644 --- a/modules/autoinstall/queries/getInstalledPackageCount.xml +++ b/modules/autoinstall/queries/getInstalledPackageCount.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/queries/getInstalledPackageList.xml b/modules/autoinstall/queries/getInstalledPackageList.xml index d9c82f7c0..e55eaa502 100644 --- a/modules/autoinstall/queries/getInstalledPackageList.xml +++ b/modules/autoinstall/queries/getInstalledPackageList.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/queries/getInstalledPackages.xml b/modules/autoinstall/queries/getInstalledPackages.xml index f0d8afe07..da8512403 100644 --- a/modules/autoinstall/queries/getInstalledPackages.xml +++ b/modules/autoinstall/queries/getInstalledPackages.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/queries/insertCategory.xml b/modules/autoinstall/queries/insertCategory.xml index 87e240d6f..ef09fec86 100644 --- a/modules/autoinstall/queries/insertCategory.xml +++ b/modules/autoinstall/queries/insertCategory.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/queries/insertInstalledPackage.xml b/modules/autoinstall/queries/insertInstalledPackage.xml index b05ddacc9..2829566b5 100644 --- a/modules/autoinstall/queries/insertInstalledPackage.xml +++ b/modules/autoinstall/queries/insertInstalledPackage.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/queries/updateCategory.xml b/modules/autoinstall/queries/updateCategory.xml index ec2bbcf28..e006e2437 100644 --- a/modules/autoinstall/queries/updateCategory.xml +++ b/modules/autoinstall/queries/updateCategory.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/queries/updateInstalledPackage.xml b/modules/autoinstall/queries/updateInstalledPackage.xml index 26f9c5926..b3d7782db 100644 --- a/modules/autoinstall/queries/updateInstalledPackage.xml +++ b/modules/autoinstall/queries/updateInstalledPackage.xml @@ -1,6 +1,6 @@ -
+
diff --git a/modules/autoinstall/schemas/autoinstall_installed_packages.xml b/modules/autoinstall/schemas/ai_installed_packages.xml similarity index 87% rename from modules/autoinstall/schemas/autoinstall_installed_packages.xml rename to modules/autoinstall/schemas/ai_installed_packages.xml index 84b2ef4d0..31d63febc 100644 --- a/modules/autoinstall/schemas/autoinstall_installed_packages.xml +++ b/modules/autoinstall/schemas/ai_installed_packages.xml @@ -1,4 +1,4 @@ -
+
diff --git a/modules/autoinstall/schemas/autoinstall_remote_categories.xml b/modules/autoinstall/schemas/ai_remote_categories.xml similarity index 87% rename from modules/autoinstall/schemas/autoinstall_remote_categories.xml rename to modules/autoinstall/schemas/ai_remote_categories.xml index 6e25f12b9..f35939259 100644 --- a/modules/autoinstall/schemas/autoinstall_remote_categories.xml +++ b/modules/autoinstall/schemas/ai_remote_categories.xml @@ -1,4 +1,4 @@ -
+