feat: Able to view the list of users associated with an Organization (#…

…8511)
openfoodfacts · Jun 14, 2023 · 2472419 · 2472419
1 parent 4b66a91
commit 2472419
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 1 deletion.
diff --git a/lib/ProductOpener/Display.pm b/lib/ProductOpener/Display.pm
@@ -3898,6 +3898,14 @@ HTML
 						$user_template_data_ref->{edit_profile} = 1;
 						$user_template_data_ref->{orgid} = $orgid;
 					}
+					if (defined $User{pro_moderator}) {
+						my @org_members;
+						foreach my $member_id (sort keys %{$user_or_org_ref->{members}}) {
+							my $member_user_ref = retrieve_user($member_id);
+							push @org_members, $member_user_ref;
+						}
+						$user_template_data_ref->{org_members} = \@org_members;
+					}
 
 					process_template('web/pages/org_profile/org_profile.tt.html',
 						$user_template_data_ref, \$profile_html)

diff --git a/lib/ProductOpener/Users.pm b/lib/ProductOpener/Users.pm
@@ -63,6 +63,7 @@ BEGIN {
 		&is_admin_user
 		&create_password_hash
 		&check_password_hash
+		&retrieve_user
 
 		&check_session
 
@@ -921,6 +922,15 @@ sub open_user_session ($user_ref, $request_ref) {
 	return;
 }
 
+sub retrieve_user ($user_id) {
+	my $user_file = "$data_root/users/" . get_string_id_for_lang("no_language", $user_id) . ".sto";
+	my $user_ref;
+	if (-e $user_file) {
+		$user_ref = retrieve($user_file);
+	}
+	return $user_ref;
+}
+
 sub init_user ($request_ref) {
 
 	my $user_id = undef;

diff --git a/po/common/common.pot b/po/common/common.pot
@@ -5043,6 +5043,19 @@ msgctxt "official_site"
 msgid "Official site"
 msgstr "Official site"
 
+msgctxt "organization_members"
+msgid "Organization Members"
+msgstr "Organization Members"
+
+msgctxt "number_of_members"
+msgid "Number of Members"
+msgstr "Number of Members"
+
+msgctxt "serial_no"
+msgid "S.No"
+msgstr "S.No"
+
+
 msgctxt "contact_form"
 msgid "Contact form"
 msgstr "Contact form"

diff --git a/po/common/en.po b/po/common/en.po
@@ -5080,6 +5080,19 @@ msgctxt "official_site"
 msgid "Official site"
 msgstr "Official site"
 
+msgctxt "organization_members"
+msgid "Organization Members"
+msgstr "Organization Members"
+
+msgctxt "number_of_members"
+msgid "Number of Members"
+msgstr "Number of Members"
+
+msgctxt "serial_no"
+msgid "S.No"
+msgstr "S.No"
+
+
 msgctxt "contact_form"
 msgid "Contact form"
 msgstr "Contact form"

diff --git a/scss/_off.scss b/scss/_off.scss
@@ -1450,4 +1450,4 @@ a.panel_title {
 .button:focus, .button:hover, button:focus, button:hover {
     background-color: scale-color($button-bg-color, $lightness: -$button-function-factor / 2);
     color: #fff;
-}
+}
diff --git a/templates/web/pages/org_profile/org_profile.tt.html b/templates/web/pages/org_profile/org_profile.tt.html
@@ -14,6 +14,41 @@
 	<p>&rarr; <a href="[% link %]">[% lang("official_site") %]</a></p>
 [% END %]
 
+[% IF org_members.size %]
+<h2>[% lang("organization_members") %]</h2>
+	<p>[% lang("number_of_members") %][% sep %]: [% org_members.size %]</p>
+	<div style="position:relative">
+	<table>
+		<thead>
+		<tr>
+			<th>[% lang("serial_no") %]</th>
+			<th>[% lang("username") %]</th>
+			<th>[% lang("name") %]</th>
+			<th>[% lang("email") %]</th>
+			<th>[% lang("select_lang") %]</th>
+			<th>[% lang("select_country") %]</th>
+
+		</tr>
+	</thead>
+		<tbody>
+		[% FOREACH users IN org_members %]
+		[% SET count = 1 %]
+		<tr>
+			<td>[% count %].</td>
+			<td>[% users.userid %]</td>
+			<td>[% users.name %]</td>
+			<td>[% users.email %]</td>
+			<td>[% users.initial_lc %]</td>
+			<td>[% users.initial_cc %]</td>
+		</tr>
+		[% SET count = count + 1 %]
+		[% END %]
+	</tbody>
+	</table>
+</div>
+[% END %]
+
+
 <div class="row">
 
 [% FOREACH contact IN ['customer_service', 'commercial_service'] %]