Merge branch 'master' of ssh://biuro.biall-net.pl:2222/plabudda/se

SE/se-lib/TableAjax.php

@@ -2219,7 +2219,7 @@ jQuery(document).ready(function(){
 		DBG::log($jsonData->cols, 'array', "\$jsonData->cols");
 		$jsonData->rows = array();
 		if ($acl instanceof AntAclBase) {
-			$params['f_is_instance'] = $acl->getNamespace();
+			// $params['f_is_instance'] = $acl->getNamespace(); // check instances turned off @see: ACL::fetchBackRefs
 		}
 		$queryFeatures = $acl->buildQuery($params);
 		$jsonData->total = ('1' === V::get('SKIP_TOTAL', '', $args)) ? -1 : $queryFeatures->getTotal();

SE/se-lib/TableAjax.php.TableAjax.js

@@ -129,6 +129,7 @@ global['P5UI__TableAjaxSpecialFilter'] = createReactClass({
 				DBG && console.warn('DBG:renderButton click', { value });
 				this.handleSetFilter(value);
 			}.bind(this),
+			style: (this.state.selected) ? { borderTopColor: "#46b8da", borderBottomColor: "#46b8da" } : {},
 		}, option);
 	},
 	render: function () {
@@ -139,6 +140,7 @@ global['P5UI__TableAjaxSpecialFilter'] = createReactClass({
 				h('button', {
 					className: "btn btn-xs btn-default",
 					title: label,
+					style: (this.state.selected) ? { backgroundColor: "#d9edf7", borderColor: "#46b8da" } : {},
 				}, [
 					h('i', { className: this.props.icon })
 				])
@@ -151,7 +153,10 @@ global['P5UI__TableAjaxSpecialFilter'] = createReactClass({
 						title: "Kasuj filtr",
 						disabled: !this.state.selected,
 						onClick: this.handleRemoveFilter,
-						style: { color: !this.state.selected ? '#bbb' : '#f00' }
+						style: Object.assign(
+							{ color: !this.state.selected ? '#bbb' : '#f00' },
+							(this.state.selected) ? { backgroundColor: "#d9edf7", borderColor: "#46b8da" } : {}
+						),
 					}, [
 						h('i', { className: "glyphicon glyphicon-remove" })
 					])
@@ -1101,7 +1106,7 @@ var TableAjax = function() {
 
 	priv.initialRender = function() {
 		/**
-			 <topWrap /> <!-- @selected | filters -->
+			 <topWrap /> <!-- _uiNodeSelectedInfo | _uiNodeSpecialFilters -->
 			 <afterTopWrap /> <!-- for clear:both, border and padding -->
 			 <_uiMainContainerNode>
 				<_uiNode$Table>