Index: trunk/grails-app/services/com/lemans/ds/product/ProductAssociationService.groovy
===================================================================
diff -u -r9716 -r9972
--- trunk/grails-app/services/com/lemans/ds/product/ProductAssociationService.groovy	(.../ProductAssociationService.groovy)	(revision 9716)
+++ trunk/grails-app/services/com/lemans/ds/product/ProductAssociationService.groovy	(.../ProductAssociationService.groovy)	(revision 9972)
@@ -14,7 +14,7 @@
     * @return related products
     */
     Map findRelatedProducts(Map criteria) {
-        criteria.sorting ?: 'productId+ASC'
+        criteria.sorting = criteria.sorting ?: 'productId+ASC'
         dqx(criteria).executeFrom('dbo.vwProductAssociation', clauses(criteria))
     }
 
@@ -26,7 +26,7 @@
     * @return referral Products
     */
     Map findReferralProducts(Map criteria) {
-        criteria.sorting ?: 'relatedProductId+ASC'
+        criteria.sorting = criteria.sorting ?: 'relatedProductId+ASC'
         dqx(criteria).executeFrom('dbo.vwProductAssociation', clauses(criteria))
     }
 
Index: trunk/grails-app/services/com/lemans/ds/part/PartAssociationService.groovy
===================================================================
diff -u -r9717 -r9972
--- trunk/grails-app/services/com/lemans/ds/part/PartAssociationService.groovy	(.../PartAssociationService.groovy)	(revision 9717)
+++ trunk/grails-app/services/com/lemans/ds/part/PartAssociationService.groovy	(.../PartAssociationService.groovy)	(revision 9972)
@@ -14,7 +14,7 @@
     * @return related parts
     */
     Map findRelatedParts(Map criteria) {
-        criteria.sorting ?: 'partNumber+ASC'
+        criteria.sorting = criteria.sorting ?: 'partNumber+ASC'
         dqx(criteria).executeFrom('dbo.vwPartAssociation', clauses(criteria))
     }
 
@@ -26,7 +26,7 @@
     * @return referral parts
     */
     Map findReferralParts(Map criteria) {
-        criteria.sorting ?: 'relatedPartNumber+ASC'
+        criteria.sorting = criteria.sorting ?: 'relatedPartNumber+ASC'
         dqx(criteria).executeFrom('dbo.vwPartAssociation', clauses(criteria))
     }
 
Index: trunk/grails-app/services/com/lemans/ds/publicationcategory/ProductPublicationCategoryService.groovy
===================================================================
diff -u -r9970 -r9972
--- trunk/grails-app/services/com/lemans/ds/publicationcategory/ProductPublicationCategoryService.groovy	(.../ProductPublicationCategoryService.groovy)	(revision 9970)
+++ trunk/grails-app/services/com/lemans/ds/publicationcategory/ProductPublicationCategoryService.groovy	(.../ProductPublicationCategoryService.groovy)	(revision 9972)
@@ -15,7 +15,7 @@
      */
     Map productPublicationCategoriesByCategoryId(Map criteria) {
         criteria.sorting = criteria.sorting ?: 'categoryId+ASC'
-        dqx(criteria).executeFrom('vwProductPublicationCategory', ['categoryId = :categoryId'])
+        dqx(criteria).executeFrom('vwProductPublicationCategory', ['categoryId = :categoryId', 'isDigiActive = :isDigiActive'])
     }
 
     /**
@@ -38,7 +38,7 @@
      */
     Map productPublicationCategoriesByProductId(Map criteria) {
         criteria.sorting = criteria.sorting ?: 'categoryId+ASC'
-        dqx(criteria).executeFrom('vwProductPublicationCategory', ['productId = :productId'])
+        dqx(criteria).executeFrom('vwProductPublicationCategory', ['productId = :productId', 'isDigiActive = :isDigiActive'])
     }
 
     ProductPublicationCategory findProductPublicationCategory(Integer categoryId, Integer productId) {
Index: trunk/grails-app/controllers/com/lemans/ds/publicationcategory/ProductPublicationCategoryController.groovy
===================================================================
diff -u -r9965 -r9972
--- trunk/grails-app/controllers/com/lemans/ds/publicationcategory/ProductPublicationCategoryController.groovy	(.../ProductPublicationCategoryController.groovy)	(revision 9965)
+++ trunk/grails-app/controllers/com/lemans/ds/publicationcategory/ProductPublicationCategoryController.groovy	(.../ProductPublicationCategoryController.groovy)	(revision 9972)
@@ -9,7 +9,7 @@
     def productPublicationCategoryManagerService
 
     def byCategoryId(Integer categoryId) {
-        Map criteria = common() + pagination() + [categoryId: categoryId]
+        Map criteria = common() + pagination() + [categoryId: categoryId, isDigiActive: 1]
         renderPaginated productPublicationCategoryService.productPublicationCategoriesByCategoryId(criteria)
     }
 
@@ -18,7 +18,7 @@
     }
 
     def byProductId(Integer productId) {
-        Map criteria = common() + pagination() + [productId: productId]
+        Map criteria = common() + pagination() + [productId: productId, isDigiActive: 1]
         renderPaginated productPublicationCategoryService.productPublicationCategoriesByProductId(criteria)
     }
 
Index: trunk/grails-app/services/com/lemans/ds/publicationcategory/PublicationCategoryService.groovy
===================================================================
diff -u -r9771 -r9972
--- trunk/grails-app/services/com/lemans/ds/publicationcategory/PublicationCategoryService.groovy	(.../PublicationCategoryService.groovy)	(revision 9771)
+++ trunk/grails-app/services/com/lemans/ds/publicationcategory/PublicationCategoryService.groovy	(.../PublicationCategoryService.groovy)	(revision 9972)
@@ -14,7 +14,7 @@
      * @return Publication Categories data
      */
     Map findPublicationCategories(Map criteria) {
-        criteria.sorting ?: 'categoryId+ASC'
+        criteria.sorting = criteria.sorting ?: 'categoryId+ASC'
         dqx(criteria).executeFrom('dbo.vwPublicationCategory')
     }