Relations use the wrong gender in parent - child relationships #1130

Admidio · Nov 20, 2021 · db05a6f · db05a6f
1 parent 8ac62db
commit db05a6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/adm_program/languages/en.xml b/adm_program/languages/en.xml
@@ -542,13 +542,14 @@
   <string name="SYS_ASSIGN_EDIT_MEMBERS">Assign and edit members</string>
   <string name="SYS_ASSIGN_FIELDS">Assign fields</string>
   <string name="SYS_ASSIGN_FIELDS_DESC">If possible, assign to database fields one column of a file.\n\nOn the left side you are able to find all types of database fields, on the right side you can find all columns of the selected file. Fields may be left empty when the file does not include every database field.</string>
-  <string name="SYS_ASSIGN_LOGIN_INFORMATION">Assigning login data</string>
+  <string name="SYS_ASSIGN_LOGIN_INFORMATION">Assign login data</string>
   <string name="SYS_ASSIGN_LOGIN_SUCCESSFUL">Login data has been successfully assigned.</string>
   <string name="SYS_ASSIGN_LOGIN_EMAIL">Login data has been successfully assigned and user has been informed via e-mail.</string>
-  <string name="SYS_ASSIGN_MEMBERS">Assigning members</string>
-  <string name="SYS_ASSIGN_MEMBERSHIP">Assigning membership</string>
-  <string name="SYS_ASSIGN_MEMBERSHIP_AND_LOGIN">Assigning membership and login information to selected user.</string>
-  <string name="SYS_ASSIGN_REGISTRATION">Assigning registration</string>
+  <string name="SYS_ASSIGN_MEMBERS">Assign members</string>
+  <string name="SYS_ASSIGN_MEMBERSHIP">Assign membership</string>
+  <string name="SYS_ASSIGN_MEMBERSHIP_AND_LOGIN">Assign membership and login information to selected user.</string>
+  <string name="SYS_ASSIGN_REGISTRATION">Assign registration</string>
+  <string name="SYS_ASSIGN_RELATIONSHIP">Assign relationship</string>
   <string name="SYS_ASSIGN_ROLE">Assign role</string>
   <string name="SYS_ASSIGN_ROLE_FOR_IMPORT">Select a role for all imported users.\n\nAvailable are only roles which you have user permission for.</string>
   <string name="SYS_ASSIGN_ROLES">Assign roles</string>

diff --git a/adm_program/modules/userrelations/userrelations_new.php b/adm_program/modules/userrelations/userrelations_new.php
@@ -58,14 +58,15 @@
 
 // show form
 $form = new HtmlForm('relation_edit_form', SecurityUtils::encodeUrl(ADMIDIO_URL.FOLDER_MODULES.'/userrelations/userrelations_function.php', array('user_uuid' => $getUserUuid, 'mode' => '1')), $page);
-
+$form->openGroupBox('gbUser');
 $form->addInput(
     'usr_id',
     $gL10n->get('SYS_USER'),
     $user->getValue('FIRST_NAME').' '.$user->getValue('LAST_NAME'),
     array('maxLength' => 100, 'property' => HtmlForm::FIELD_DISABLED)
 );
-
+$form->closeGroupBox();
+$form->openGroupBox('gbAssignRelationship', $gL10n->get('SYS_ASSIGN_RELATIONSHIP'));
 // select box showing all relation types
 $sql = 'SELECT urt_id, urt_name
           FROM '.TBL_USER_RELATION_TYPES.'
@@ -172,6 +173,7 @@
     $sqlData,
     array('property' => HtmlForm::FIELD_REQUIRED, 'search' => true)
 );
+$form->closeGroupBox();
 $form->addSubmitButton('btn_save', $gL10n->get('SYS_SAVE'), array('icon' => 'fa-check'));
 
 // add form to html page and show page