#2772 - core

inc/classes/BxDolCategoriesQuery.php

@@ -67,8 +67,13 @@ class BxDolCategoriesQuery extends BxDolDb
 
                 );
                 
+                $oModule = BxDolModule::getInstance($aParams['module']);
+                $CNF = $oModule->_oConfig->CNF;
+                
                 $sSelectClause = "`sc`.`value`, COUNT(`sc`.`id`) as `num`";
                 $sJoinClause = "INNER JOIN `sys_categories2objects` `soc` ON `sc`.`id` =  `soc`.`category_id`";
+                if (isset($CNF['FIELD_STATUS']))
+                    $sJoinClause .= "INNER JOIN `" . $CNF['TABLE_ENTRIES'] . "` `data` ON `soc`.`object_id` =  `data`.`id` AND `data`.`" . $CNF['FIELD_STATUS'] . "` = 'active'";
                 $sWhereClause = " AND `sc`.`status` = 'active' AND `soc`.`module` = :module";
                 $sGroupClause = "`sc`.`id`";
                 $sOrderClause = "`num` DESC";
@@ -116,6 +121,7 @@ class BxDolCategoriesQuery extends BxDolDb
         $aMethod['params'][0] = "SELECT " . $sSelectClause . " 
             FROM `" . $this->_sTableCategories . "` AS `sc`" . $sJoinClause . " 
             WHERE 1" . $sWhereClause . " " . $sGroupClause . " " . $sOrderClause;
+        echo $aMethod['params'][0];
         return call_user_func_array(array($this, $aMethod['name']), $aMethod['params']);
     }
     

modules/boonex/videos/js/categories.js → inc/js/classes/BxDolCategories.js

@@ -2,15 +2,14 @@
  * Copyright (c) UNA, Inc - https://una.io
  * MIT License - https://opensource.org/licenses/MIT
  *
- * @defgroup    Videos Videos
- * @ingroup     UnaModules
+ * @defgroup    UnaCore UNA Core
  *
  * @{
  */
 
-function BxVideosCategories(oOptions) {
+function BxDolCategories(oOptions) {
     this._sActionsUrl = oOptions.sActionUrl;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxVideosCategories' : oOptions.sObjName;
+    this._sObjName = oOptions.sObjName == undefined ? 'oBxDolCategories' : oOptions.sObjName;
 
     this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'slide' : oOptions.sAnimationEffect;
     this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
@@ -19,7 +18,7 @@ function BxVideosCategories(oOptions) {
     this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
 }
 
-BxVideosCategories.prototype.categoryAdd = function (oButton, sName) {
+BxDolCategories.prototype.categoryAdd = function (oButton, sName) {
     var oButton = $(oButton);
 
     var oCategory = oButton.parents('#bx-form-element-' + sName).find('.bx-form-input-category:first').clone();
@@ -29,7 +28,7 @@ BxVideosCategories.prototype.categoryAdd = function (oButton, sName) {
     oButton.parents('.bx-form-input-category-add:first').before(oCategory);
 };
 
-BxVideosCategories.prototype.categoryAddNew = function (oButton, sName) {
+BxDolCategories.prototype.categoryAddNew = function (oButton, sName) {
     var oButton = $(oButton);
 
     var oCategory = oButton.parents('#bx-form-element-' + sName).find('.bx-form-input-category-new:first').clone();
@@ -39,10 +38,10 @@ BxVideosCategories.prototype.categoryAddNew = function (oButton, sName) {
     $('.bx-form-input-categories .bx-form-input-category-add:first').before(oCategory);
 };
 
-BxVideosCategories.prototype.categoryDelete = function (oButton) {
+BxDolCategories.prototype.categoryDelete = function (oButton) {
     $(oButton).parents('.bx-form-input-category:first').remove();
 };
 
-BxVideosCategories.prototype.categoryDeleteNew = function (oButton) {
+BxDolCategories.prototype.categoryDeleteNew = function (oButton) {
     $(oButton).parents('.bx-form-input-category-new:first').remove();
 };

modules/boonex/forum/js/categories.js

@@ -1,48 +0,0 @@
-/**
- * Copyright (c) UNA, Inc - https://una.io
- * MIT License - https://opensource.org/licenses/MIT
- *
- * @defgroup    Forum Forum
- * @ingroup     UnaModules
- *
- * @{
- */
-
-function BxForumCategories(oOptions) {
-    this._sActionsUrl = oOptions.sActionUrl;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxPostsCategories' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'slide' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
-}
-
-BxForumCategories.prototype.categoryAdd = function (oButton, sName) {
-    var oButton = $(oButton);
-
-    var oCategory = oButton.parents('#bx-form-element-' + sName).find('.bx-form-input-category:first').clone();
-    oCategory.find("input[type = 'text']").val('');
-    oCategory.find("input[type = 'hidden']").remove();
-
-    oButton.parents('.bx-form-input-category-add:first').before(oCategory);
-};
-
-BxForumCategories.prototype.categoryAddNew = function (oButton, sName) {
-    var oButton = $(oButton);
-
-    var oCategory = oButton.parents('#bx-form-element-' + sName).find('.bx-form-input-category-new:first').clone();
-    oCategory.find("input[type = 'text']").val('');
-    oCategory.find("input[type = 'hidden']").remove();
-
-    $('.bx-form-input-categories .bx-form-input-category-add:first').before(oCategory);
-};
-
-BxForumCategories.prototype.categoryDelete = function (oButton) {
-    $(oButton).parents('.bx-form-input-category:first').remove();
-};
-
-BxForumCategories.prototype.categoryDeleteNew = function (oButton) {
-    $(oButton).parents('.bx-form-input-category-new:first').remove();
-};

modules/boonex/organizations/js/categories.js

@@ -1,48 +0,0 @@
-/**
- * Copyright (c) UNA, Inc - https://una.io
- * MIT License - https://opensource.org/licenses/MIT
- *
- * @defgroup    Organizations Organizations
- * @ingroup     UnaModules
- *
- * @{
- */
-
-function BxOrgsCategories(oOptions) {
-    this._sActionsUrl = oOptions.sActionUrl;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxOrgsCategories' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'slide' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
-}
-
-BxOrgsCategories.prototype.categoryAdd = function (oButton, sName) {
-    var oButton = $(oButton);
-
-    var oCategory = oButton.parents('#bx-form-element-' + sName).find('.bx-form-input-category:first').clone();
-    oCategory.find("input[type = 'text']").val('');
-    oCategory.find("input[type = 'hidden']").remove();
-
-    oButton.parents('.bx-form-input-category-add:first').before(oCategory);
-};
-
-BxOrgsCategories.prototype.categoryAddNew = function (oButton, sName) {
-    var oButton = $(oButton);
-
-    var oCategory = oButton.parents('#bx-form-element-' + sName).find('.bx-form-input-category-new:first').clone();
-    oCategory.find("input[type = 'text']").val('');
-    oCategory.find("input[type = 'hidden']").remove();
-
-    $('.bx-form-input-categories .bx-form-input-category-add:first').before(oCategory);
-};
-
-BxOrgsCategories.prototype.categoryDelete = function (oButton) {
-    $(oButton).parents('.bx-form-input-category:first').remove();
-};
-
-BxOrgsCategories.prototype.categoryDeleteNew = function (oButton) {
-    $(oButton).parents('.bx-form-input-category-new:first').remove();
-};

modules/boonex/posts/js/categories.js

@@ -1,48 +0,0 @@
-/**
- * Copyright (c) UNA, Inc - https://una.io
- * MIT License - https://opensource.org/licenses/MIT
- *
- * @defgroup    Posts Posts
- * @ingroup     UnaModules
- *
- * @{
- */
-
-function BxPostsCategories(oOptions) {
-    this._sActionsUrl = oOptions.sActionUrl;
-    this._sObjName = oOptions.sObjName == undefined ? 'oBxPostsCategories' : oOptions.sObjName;
-
-    this._sAnimationEffect = oOptions.sAnimationEffect == undefined ? 'slide' : oOptions.sAnimationEffect;
-    this._iAnimationSpeed = oOptions.iAnimationSpeed == undefined ? 'slow' : oOptions.iAnimationSpeed;
-
-    this._aHtmlIds = oOptions.aHtmlIds == undefined ? {} : oOptions.aHtmlIds;
-    this._oRequestParams = oOptions.oRequestParams == undefined ? {} : oOptions.oRequestParams;
-}
-
-BxPostsCategories.prototype.categoryAdd = function (oButton, sName) {
-    var oButton = $(oButton);
-
-    var oCategory = oButton.parents('#bx-form-element-' + sName).find('.bx-form-input-category:first').clone();
-    oCategory.find("input[type = 'text']").val('');
-    oCategory.find("input[type = 'hidden']").remove();
-
-    oButton.parents('.bx-form-input-category-add:first').before(oCategory);
-};
-
-BxPostsCategories.prototype.categoryAddNew = function (oButton, sName) {
-    var oButton = $(oButton);
-
-    var oCategory = oButton.parents('#bx-form-element-' + sName).find('.bx-form-input-category-new:first').clone();
-    oCategory.find("input[type = 'text']").val('');
-    oCategory.find("input[type = 'hidden']").remove();
-
-    $('.bx-form-input-categories .bx-form-input-category-add:first').before(oCategory);
-};
-
-BxPostsCategories.prototype.categoryDelete = function (oButton) {
-    $(oButton).parents('.bx-form-input-category:first').remove();
-};
-
-BxPostsCategories.prototype.categoryDeleteNew = function (oButton) {
-    $(oButton).parents('.bx-form-input-category-new:first').remove();
-};