diff --git a/modules/module/conf/module.xml b/modules/module/conf/module.xml
index 94ff1e4a1..3f35083d4 100644
--- a/modules/module/conf/module.xml
+++ b/modules/module/conf/module.xml
@@ -28,8 +28,9 @@
-
-
+
+
+
diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php
index 384196286..57e328572 100644
--- a/modules/module/module.admin.controller.php
+++ b/modules/module/module.admin.controller.php
@@ -22,27 +22,41 @@
if(!$output->toBool()) return $output;
$this->setMessage("success_registed");
+ if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+ $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
+ header('location:'.$returnUrl);
+ return;
+ }
}
/**
* @brief Update category
**/
function procModuleAdminUpdateCategory() {
- $mode = Context::get('mode');
-
- switch($mode) {
- case 'delete' :
- $output = $this->doDeleteModuleCategory();
- $msg_code = 'success_deleted';
- break;
- case 'update' :
- $output = $this->doUpdateModuleCategory();
- $msg_code = 'success_updated';
- break;
- }
+ $output = $this->doUpdateModuleCategory();
if(!$output->toBool()) return $output;
- $this->setMessage($msg_code);
+ $this->setMessage('success_updated');
+ if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+ $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
+ header('location:'.$returnUrl);
+ return;
+ }
+ }
+
+ /**
+ * @brief Delete category
+ **/
+ function procModuleAdminDeleteCategory() {
+ $output = $this->doDeleteModuleCategory();
+ if(!$output->toBool()) return $output;
+
+ $this->setMessage('success_deleted');
+ if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+ $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
+ header('location:'.$returnUrl);
+ return;
+ }
}
/**
diff --git a/modules/module/ruleset/deleteCategory.xml b/modules/module/ruleset/deleteCategory.xml
new file mode 100644
index 000000000..2d09d7867
--- /dev/null
+++ b/modules/module/ruleset/deleteCategory.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/modules/module/ruleset/insertCategory.xml b/modules/module/ruleset/insertCategory.xml
new file mode 100644
index 000000000..79b27e272
--- /dev/null
+++ b/modules/module/ruleset/insertCategory.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/modules/module/ruleset/updateCategory.xml b/modules/module/ruleset/updateCategory.xml
new file mode 100644
index 000000000..089d3017f
--- /dev/null
+++ b/modules/module/ruleset/updateCategory.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
diff --git a/modules/module/tpl/category_list.html b/modules/module/tpl/category_list.html
index 84f4f3fb3..c16fe99c7 100644
--- a/modules/module/tpl/category_list.html
+++ b/modules/module/tpl/category_list.html
@@ -1,12 +1,12 @@
-
+
{$XE_VALIDATOR_ERROR}
-
-