diff --git a/migration/20.10/2010.sql b/migration/20.10/2010.sql index 78a59668e2395040e274d869c11f78e2ba7be0fe..b02971a72be2be2d1867b488d34a802f61378def 100755 --- a/migration/20.10/2010.sql +++ b/migration/20.10/2010.sql @@ -169,6 +169,7 @@ DO $$ BEGIN UPDATE baskets SET basket_clause = REGEXP_REPLACE(basket_clause, '\(res_id,(\s*)@user\)', '(res_id, @user_id)', 'gmi'); UPDATE security SET where_clause = REGEXP_REPLACE(where_clause, 'item_id(\s*)=(\s*)@user ', 'item_id = @user_id ', 'gmi'); UPDATE baskets SET basket_clause = REGEXP_REPLACE(basket_clause, 'item_id(\s*)in(\s*)\(@subentities\[@my_primary_entity\]\)', 'item_id in (@subentities_id[@my_primary_entity_id])', 'gmi'); + UPDATE baskets SET basket_clause = REGEXP_REPLACE(basket_clause, 'item_id(\s*)in(\s*)\(@subentities\[@my_entities\]\)', 'item_id in (@subentities_id[@my_entities_id])', 'gmi'); END IF; END$$; DO $$ BEGIN diff --git a/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html b/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html index e5730ca7d210ee5b385165aada21363ffbb90c9c..e6e0662517c79f2b7f0431dd2a80a24d698da9b6 100755 --- a/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html +++ b/src/frontend/app/administration/basket/basket-administration-settings-modal.component.html @@ -84,6 +84,8 @@ <h4 mat-line style="font-weight:bold;font-size:10px;"> @subentities[('entity_1',...,'entity_n')] :</h4> <p mat-line style="font-size:10px;">{{'lang.keywordHelpDesc_5' | translate}}</p> + <h4 mat-line style="font-weight:bold;font-size:10px;">@subentities_id[(1, 2, ...)] :</h4> + <p mat-line style="font-size:10px;">{{'lang.keywordHelpDesc_15' | translate}}</p> <h4 mat-line style="font-weight:bold;font-size:10px;">@parent_entity['entity_id'] :</h4> <p mat-line style="font-size:10px;">{{'lang.keywordHelpDesc_6' | translate}}</p> <h4 mat-line style="font-weight:bold;font-size:10px;">@sisters_entities['entity_id'] : diff --git a/src/frontend/app/administration/basket/basket-administration.component.html b/src/frontend/app/administration/basket/basket-administration.component.html index f557d9393301ffbd3615dee7035c0f13c98087b9..f754f3329e7e589e5b267ffa126fd8e1a09d76cd 100755 --- a/src/frontend/app/administration/basket/basket-administration.component.html +++ b/src/frontend/app/administration/basket/basket-administration.component.html @@ -257,6 +257,8 @@ <p mat-line style="font-size:10px;">{{'lang.keywordHelpDesc_14' | translate}}</p> <h4 mat-line style="font-weight:bold;font-size:10px;">@subentities[('entity_1',...,'entity_n')] :</h4> <p mat-line style="font-size:10px;">{{'lang.keywordHelpDesc_5' | translate}}</p> + <h4 mat-line style="font-weight:bold;font-size:10px;">@subentities_id[(1, 2, ...)] :</h4> + <p mat-line style="font-size:10px;">{{'lang.keywordHelpDesc_15' | translate}}</p> <h4 mat-line style="font-weight:bold;font-size:10px;">@parent_entity['entity_id'] :</h4> <p mat-line style="font-size:10px;">{{'lang.keywordHelpDesc_6' | translate}}</p> <h4 mat-line style="font-weight:bold;font-size:10px;">@sisters_entities['entity_id'] :</h4> diff --git a/src/frontend/app/administration/group/group-administration.component.html b/src/frontend/app/administration/group/group-administration.component.html index f25c375882d3e343bab21d48a0c7ef35314619b5..fbe7381a17c6b2d524c87a18fa64fb8c3a3ce461 100755 --- a/src/frontend/app/administration/group/group-administration.component.html +++ b/src/frontend/app/administration/group/group-administration.component.html @@ -272,6 +272,8 @@ <h4 mat-line style="font-weight:bold;font-size:10px;">@subentities[('entity_1',...,'entity_n')] : </h4> <p mat-line style="font-size:10px;">{{'lang.keywordHelpDesc_5' | translate}}</p> + <h4 mat-line style="font-weight:bold;font-size:10px;">@subentities_id[(1, 2, ...)] :</h4> + <p mat-line style="font-size:10px;">{{'lang.keywordHelpDesc_15' | translate}}</p> <h4 mat-line style="font-weight:bold;font-size:10px;">@parent_entity['entity_id'] :</h4> <p mat-line style="font-size:10px;">{{'lang.keywordHelpDesc_6' | translate}}</p> <h4 mat-line style="font-weight:bold;font-size:10px;">@sisters_entities['entity_id'] :</h4> @@ -305,4 +307,4 @@ </mat-list> </ng-container> </mat-sidenav> -</mat-sidenav-container> \ No newline at end of file +</mat-sidenav-container> diff --git a/src/lang/lang-en.json b/src/lang/lang-en.json index 6784f84bd094776a59bba7f1c2bcfa0c87087af1..2f2b7263b54e23c7a67af266d6b8867d19cc2597 100644 --- a/src/lang/lang-en.json +++ b/src/lang/lang-en.json @@ -841,6 +841,7 @@ "keywordHelpDesc_4": "Logged user's primary entity", "keywordHelpDesc_14": "Logged user's identifier primary entity", "keywordHelpDesc_5": "Sub-entities of argument list, can be @my_entities or @my_primary_entity", + "keywordHelpDesc_15": "Technical id of sub-entities of argument list, can be @my_entities_id or @my_primary_entity_id", "keywordHelpDesc_6": "Parent entity passed as argument", "keywordHelpDesc_7": "All entities to the same level of entity passed as argument", "keywordHelpDesc_8": "All entities with de same type passed as argument", diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json index cbc194d749ff89df3d50a5015aff500cb6cecec7..2ceb6e406c32515decb346cbfe2bc5a0a814829f 100644 --- a/src/lang/lang-fr.json +++ b/src/lang/lang-fr.json @@ -845,6 +845,7 @@ "keywordHelpDesc_4": "Entité primaire de l'utilisateur connecté", "keywordHelpDesc_14": "Identifiant technique de l'entité primaire de l'utilisateur connecté", "keywordHelpDesc_5": "Sous-entités de la liste d'argument, qui peut aussi être @my_entities ou @my_primary_entity", + "keywordHelpDesc_15": "Identifiants techniques des sous-entités de la liste d'argument, qui peut aussi être @my_entities_id ou @my_primary_entity_id", "keywordHelpDesc_6": "Entité parente de l'entité en argument", "keywordHelpDesc_7": "Toutes les entités du même niveau que l'entité en argument", "keywordHelpDesc_8": "Toutes les entités du même type mis en argument", diff --git a/src/lang/lang-nl.json b/src/lang/lang-nl.json index 4e0a41350b2f177f81bc373b3101c1e1e7ae0764..727bb93503a5354b7a97298b7369fa88e3c2118c 100644 --- a/src/lang/lang-nl.json +++ b/src/lang/lang-nl.json @@ -356,6 +356,7 @@ "keywordHelpDesc_3": "Alle eenheden die aan de verbonden gebruiker gekoppeld zijn Bevat geen subeenheden", "keywordHelpDesc_4": "Primaire eenheid van de verbonden gebruiker", "keywordHelpDesc_5": "Subeenheden van de argumentenlijst die ook @my_entities of @my_primary_entity kan zijn", + "keywordHelpDesc_15": "Technical id of sub-entities of argument list, can be @my_entities_id or @my_primary_entity_id __TO_TRANSLATE", "keywordHelpDesc_6": "Bovenliggende eenheid van de eenheid in het argument", "keywordHelpDesc_7": "Alle eenheden van hetzelfde niveau van de eenheid in het argument", "keywordHelpDesc_8": "Alle eenheden van hetzelfde type dat in het argument voorkomt",