Customer portal : UX adjustments on LinkedSet (Collapse toggler pictos, check all/none state)

SVN:trunk[4098]

datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php

@@ -34,6 +34,8 @@ use \DBObjectSearch;
 use \BinaryExpression;
 use \FieldExpression;
 use \VariableExpression;
+use \ListExpression;
+use \ScalarExpression;
 use \DBObjectSet;
 use \cmdbAbstractObject;
 use \UserRights;
@@ -685,6 +687,7 @@ class ObjectController extends AbstractController
 		$sQuery = $oRequest->get('sSearchValue');
 		$sFormPath = $oRequest->get('sFormPath');
 		$sFieldId = $oRequest->get('sFieldId');
+		$aObjectIdsToIgnore = $oRequest->get('aObjectIdsToIgnore');
 
 		// Building search query
 		// - Retrieving target object class from attcode
@@ -721,6 +724,7 @@ class ObjectController extends AbstractController
 
 		// - Retrieving scope search
 		$oScopeSearch = $oApp['scope_validator']->GetScopeFilterForProfiles(UserRights::ListProfiles(), $sTargetObjectClass, UR_ACTION_READ);
+		$aInternalParams = array();
 		if ($oScopeSearch === null)
 		{
 			$oApp->abort(404, Dict::S('UI:ObjectDoesNotExist'));
@@ -736,8 +740,20 @@ class ObjectController extends AbstractController
 			$oSearch = $oScopeSearch;
 		}
 
+		// - Filtering objects to ignore
+		if (($aObjectIdsToIgnore !== null) && (is_array($aObjectIdsToIgnore)))
+		{
+			//$oSearch->AddConditionExpression('id', $aObjectIdsToIgnore, 'NOT IN');
+			$aExpressions = array();
+			foreach ($aObjectIdsToIgnore as $sObjectIdToIgnore)
+			{
+				$aExpressions[] = new ScalarExpression($sObjectIdToIgnore);
+			}
+			$oSearch->AddConditionExpression(new BinaryExpression(new FieldExpression('id', $oSearch->GetClassAlias()), 'NOT IN', new ListExpression($aExpressions)));
+		}
+
 		// - Adding query condition
-		$aInternalParams = array('this' => $oHostObject);
+		$aInternalParams['this'] = $oHostObject;
 		if ($sQuery !== null)
 		{
 			$oFullExpr = null;
@@ -836,7 +852,8 @@ class ObjectController extends AbstractController
 				'bMultipleSelect' => $oTargetAttDef->IsLinkSet(),
 				'aSource' => array(
 					'sFormPath' => $sFormPath,
-					'sFieldId' => $sFieldId
+					'sFieldId' => $sFieldId,
+					'aObjectIdsToIgnore' => $aObjectIdsToIgnore,
 				)
 			);
 

datamodels/2.x/itop-portal-base/portal/src/views/bricks/object/mode_search_regular.html.twig

@@ -140,6 +140,7 @@
 			"ajax": {
 				"url": "{{ app.url_generator.generate('p_object_search_from_attribute', {'sTargetAttCode': sTargetAttCode, 'sHostObjectClass': sHostObjectClass, 'sHostObjectId': sHostObjectId})|raw }}",
 				"data": function(d){
+					d.aObjectIdsToIgnore = {{ aSource.aObjectIdsToIgnore|json_encode()|raw }};
 					d.iPageNumber = Math.floor(d.start/d.length) + 1;
 					d.iCountPerPage = d.length;
 					d.columns = null;

sources/renderer/bootstrap/fieldrenderer/bslinkedsetfieldrenderer.class.inc.php

@@ -58,8 +58,9 @@ class BsLinkedSetFieldRenderer extends FieldRenderer
 		if (!$this->oField->GetHidden())
 		{
 			// Rendering field
-			$sCollapseTogglerVisibleClass = 'glyphicon-menu-right';
-			$sCollapseTogglerHiddenClass = 'glyphicon-menu-down';
+			$sIsEditable = ($this->oField->GetReadOnly()) ? 'false' : 'true';
+			$sCollapseTogglerVisibleClass = 'glyphicon-menu-down';
+			$sCollapseTogglerHiddenClass = 'glyphicon-menu-down collapsed';
 			$sCollapseTogglerId = 'form_linkedset_toggler_' . $this->oField->GetGlobalId();
 			$sFieldWrapperId = 'form_linkedset_wrapper_' . $this->oField->GetGlobalId();
 			$oOutput->AddHtml('<div class="form-group ' . $sFieldMandatoryClass . '">');
@@ -115,9 +116,11 @@ EOF
 					{
 						buildTable_{$this->oField->GetGlobalId()}();
 					}
+				})
+				.on('show.bs.collapse', function(){
 					$('#{$sCollapseTogglerId} > span.glyphicon').removeClass('{$sCollapseTogglerHiddenClass}').addClass('{$sCollapseTogglerVisibleClass}');
 				})
-				.on('hidden.bs.collapse', function(){
+				.on('hide.bs.collapse', function(){
 					$('#{$sCollapseTogglerId} > span.glyphicon').removeClass('{$sCollapseTogglerVisibleClass}').addClass('{$sCollapseTogglerHiddenClass}');
 				});
 
@@ -133,16 +136,19 @@ EOF
 				var getColumnsDefinition_{$this->oField->GetGlobalId()} = function()
 				{
 					var aColumnsDefinition = [];
-					
-					aColumnsDefinition.push({
-							"width": "auto",
-							"searchable": false,
-							"sortable": false,
-							"title": '{$sSelectionInputGlobalHtml}',
-							"type": "html",
-							"data": "",
-							"render": function(data, type, row){ return '{$sSelectionInputHtml}'; }
-					});
+
+					if({$sIsEditable})
+					{
+						aColumnsDefinition.push({
+								"width": "auto",
+								"searchable": false,
+								"sortable": false,
+								"title": '{$sSelectionInputGlobalHtml}',
+								"type": "html",
+								"data": "",
+								"render": function(data, type, row){ return '{$sSelectionInputHtml}'; }
+						});
+					}
 
 					for(sKey in oColumnProperties_{$this->oField->GetGlobalId()})
 					{
@@ -183,6 +189,8 @@ EOF
 				// We would just have to override / complete the necessary elements
 				var buildTable_{$this->oField->GetGlobalId()} = function()
 				{
+					var iDefaultOrderColumnIndex = ({$sIsEditable}) ? 1 : 0;
+
 					// Instanciates datatables
 					oTable_{$this->oField->GetGlobalId()} = $('#{$sTableId}').DataTable({
 						"language": {
@@ -191,7 +199,7 @@ EOF
 						"displayLength": -1,
 						"scrollY": "300px",
 						"scrollCollapse": true,
-						"order": [[1, "asc"]],
+						"order": [[iDefaultOrderColumnIndex, "asc"]],
 						"dom": 't',
 						"columns": getColumnsDefinition_{$this->oField->GetGlobalId()}(),
 						"select": {$sSelectionOptionHtml},
@@ -321,6 +329,8 @@ EOF
 								$('#{$this->oField->GetGlobalId()}').val(JSON.stringify(aObjectIds));
 								// Updating items count
 								updateItemCount();
+								// Updating global checkbox
+								$('#{$this->oField->GetGlobalId()}_check_all').prop('checked', false);
 							})
 							.always(function(oData){
 								// Hiding loader
@@ -342,6 +352,8 @@ EOF
 							$('#{$this->oField->GetGlobalId()}').val(JSON.stringify(aObjectIds));
 							// Updating items count
 							updateItemCount();
+							// Updating global checkbox
+							$('#{$this->oField->GetGlobalId()}_check_all').prop('checked', false);
 						}
 					}
 				});
@@ -387,8 +399,7 @@ EOF
 					// - Item count state handler
 					var updateItemCount = function()
 					{
-						console.log('in fct');
-						console.log(oTable_{$this->oField->GetGlobalId()}.rows().count());
+						console.log(oSelectedItems_{$this->oField->GetGlobalId()});
 						$('#{$sCollapseTogglerId} > .text').text( oTable_{$this->oField->GetGlobalId()}.rows().count() );
 					};
 
@@ -400,10 +411,19 @@ EOF
 						oSelectedItems_{$this->oField->GetGlobalId()} = {};
 						// Updating form value
 						$("[data-field-id='{$this->oField->GetId()}'][data-form-path='{$this->oField->GetFormPath()}']").triggerHandler('set_current_value');
+						// Updating global checkbox state
+						$('#{$this->oField->GetGlobalId()}_check_all').prop('checked', false);
 						// Updating remove button
 						updateRemoveButtonState_{$this->oField->GetGlobalId()}();
 					});
 					$('#{$sButtonAddId}').off('click').on('click', function(){
+						// Preparing current values
+						var aFieldValue = JSON.parse( $('#{$this->oField->GetGlobalId()}').val() );
+						var aObjectIdsToIgnore = [];
+						for(var i in aFieldValue)
+						{
+							aObjectIdsToIgnore.push( Math.abs(aFieldValue[i].id) );
+						}
 						// Creating a new modal
 						var oModalElem;
 						if($('.modal[data-source-element="{$sButtonAddId}"]').length === 0)
@@ -423,7 +443,8 @@ EOF
 							'{$sAddButtonEndpoint}',
 							{
 								sFormPath: '{$this->oField->GetFormPath()}',
-								sFieldId: '{$this->oField->GetId()}'
+								sFieldId: '{$this->oField->GetId()}',
+								aObjectIdsToIgnore : aObjectIdsToIgnore
 							}
 						);
 						oModalElem.modal('show');
@@ -494,49 +515,4 @@ EOF
 		}
 	}
 
-	/**
-	 * Renders an regular search button
-	 *
-	 * @param RenderingOutput $oOutput
-	 */
-	protected function RenderRegularSearch(RenderingOutput &$oOutput)
-	{
-		$sSearchButtonId = 's_rg_' . $this->oField->GetGlobalId();
-		$sEndpoint = str_replace('-sMode-', 'from-attribute', $this->oField->GetSearchEndpoint());
-
-		$oOutput->AddHtml('<div class="col-xs-2 col-lg-1">');
-		$oOutput->AddHtml('<button type="button" class="btn btn-default" id="' . $sSearchButtonId . '">S</button>');
-		$oOutput->AddHtml('</div>');
-
-		$oOutput->AddJs(
-<<<EOF
-			$('#{$sSearchButtonId}').off('click').on('click', function(){
-				// Creating a new modal
-				var oModalElem;
-				if($('.modal[data-source-element="{$sSearchButtonId}"]').length === 0)
-				{
-					oModalElem = $('#modal-for-all').clone();
-					oModalElem.attr('id', '').attr('data-source-element', '{$sSearchButtonId}').appendTo('body');
-				}
-				else
-				{
-					oModalElem = $('.modal[data-source-element="{$sSearchButtonId}"]').first();
-				}
-				// Resizing to small modal
-				oModalElem.find('.modal-dialog').removeClass('modal-sm').addClass('modal-lg');
-				// Loading content
-				oModalElem.find('.modal-content').html($('#page_overlay .overlay_content').html());
-				oModalElem.find('.modal-content').load(
-					'{$sEndpoint}',
-					{
-						sFormPath: '{$this->oField->GetFormPath()}',
-						sFieldId: '{$this->oField->GetId()}'
-					}
-				);
-				oModalElem.modal('show');
-			});
-EOF
-		);
-	}
-
 }