Skip to content

Commit caa575d

Browse files
NicolasEYSSERICmmoqui
authored andcommitted
fixing bugs #9615 and #9630
replacing search local implementation (plain text search now) removing useless search limiter (lastname, firstname) closing feature #4009 fixing Sonar issues
1 parent 28b88b1 commit caa575d

File tree

11 files changed

+142
-339
lines changed

11 files changed

+142
-339
lines changed

yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle.properties

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ ErrorAddLink = Veuillez selectionner une rubrique ...
5555
Nomodel = Aucun
5656
TopicLink = Lier le contact \u00e0 d'autres rubriques
5757

58-
ExplikRecherche = <table><tr><td><b>Sur le nom</b></td><td>Saisissez le nom (ou le d\u00e9but du nom)</td></tr><tr><td><b>Sur le nom et le pr\u00e9nom</b></td><td>Saisissez le nom (ou le d\u00e9but du nom), un espace, le pr\u00e9nom (ou le d\u00e9but du pr\u00e9nom)</td></tr><tr><td><b>Sur le pr\u00e9nom</b></td><td>Tapez *, un espace, le pr\u00e9nom (ou le d\u00e9but du pr\u00e9nom)</td></tr><tr><td colspan=2>La recherche ne tient pas compte de la casse mais tient compte des accents !</td></tr></table>
59-
6058
Access = Autre annuaire disponible...
6159

6260
Theme = Rubrique
@@ -69,11 +67,6 @@ Consultation = Consultation
6967

7068
GroupAdd = Ajouter un groupe d'utilisateurs
7169

72-
SearchAllFields = Tous les champs
73-
SearchLastName = Nom
74-
SearchFirstName = Pr\u00e9nom
75-
SearchLastNameFirstName = Nom et/ou pr\u00e9nom
76-
7770
yellowPages.ModelList = S\u00e9lection des mod\u00e8les disponibles
7871
yellowpages.DeleteBasketContent = Vider la corbeille
7972
yellowpages.ModelUsed = Choix des mod\u00e8les utilisables

yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_de.properties

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ ErrorAddLink = W\u00e4hlen Sie bitte eine Rubrik ...
5656
Nomodel = Kein Muster
5757
TopicLink = Der Kontakt mit anderen Rubriken verbinden
5858

59-
ExplikRecherche = <table><tr><td><b>Suche nach dem Namen</b></td><td>Den Namen (oder den Anfang des Namens) eingeben</td></tr><tr><td><b>Suche nach dem Namen und Vornamen</b></td><td>Den Namen (oder den Anfang des Namens), einen Zwischenraum und den Vornamen (oder den Anfang des Vornamens) eingeben</td></tr><tr><td><b>Suche nach dem Vornamen</b></td><td>* , einen Zwischenraum und den Vornamen (oder den Anfang des Vornamens) eingeben</td></tr><tr><td colspan=2>Die Suche unterscheiden nicht zwischen Gross- und Kleinbuchstaben, ber\u00fccksichtigt jedoch die Akzente!</td></tr></table>
60-
6159
Access = Andere verf\u00fcgbare Verzeichnise...
6260

6361
Theme = Rubrik
@@ -70,11 +68,6 @@ Consultation = Abfrage
7068

7169
GroupAdd = Hinzuf\u00fcgen einer Benutzergruppe
7270

73-
SearchAllFields = Alle Felder
74-
SearchLastName = Name
75-
SearchFirstName = Vorname
76-
SearchLastNameFirstName = Name und/oder Vorname
77-
7871
yellowPages.ModelList = Auswahl der verf\u00fcgbaren Modelle
7972
yellowpages.DeleteBasketContent = Empty Trash
8073
yellowpages.ModelUsed = Auswahl der benutzbaren Modelle

yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_en.properties

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ ErrorAddLink = Please choose a category ...
5555
Nomodel = None
5656
TopicLink = Edit category settings
5757

58-
ExplikRecherche = <table><tr><td><b>On the last name</b></td><td>Enter the last name (or the begining of the last name)</td></tr><tr><td><b>On the last name and the first name</b></td><td>Enter the last name (or the begining of the last name), a space, the first name (or the begining of the first name)</td></tr><tr><td><b>On the first name</b></td><td>Enter a *, a space, the first name (or the begining of the first name)</td></tr><tr><td colspan=2>The search is not case sensitive but takes account of the accents !</td></tr></table>
59-
6058
Access = Others directories available...
6159

6260
Theme = Category
@@ -69,11 +67,6 @@ Consultation = Consult
6967

7068
GroupAdd = Add a group of users
7169

72-
SearchAllFields = All fields
73-
SearchLastName = Last name
74-
SearchFirstName = First name
75-
SearchLastNameFirstName = Last name and/or first name
76-
7770
yellowPages.ModelList = Available templates
7871
yellowpages.DeleteBasketContent = Empty the trash
7972
yellowpages.ModelUsed = Select template

yellowpages/yellowpages-configuration/src/main/config/properties/org/silverpeas/yellowpages/multilang/yellowpagesBundle_fr.properties

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ ErrorAddLink = Veuillez selectionner une rubrique ...
5555
Nomodel = Aucun
5656
TopicLink = Lier le contact \u00e0 d'autres rubriques
5757

58-
ExplikRecherche = <table><tr><td><b>Sur le nom</b></td><td>Saisissez le nom (ou le d\u00e9but du nom)</td></tr><tr><td><b>Sur le nom et le pr\u00e9nom</b></td><td>Saisissez le nom (ou le d\u00e9but du nom), un espace, le pr\u00e9nom (ou le d\u00e9but du pr\u00e9nom)</td></tr><tr><td><b>Sur le pr\u00e9nom</b></td><td>Tapez *, un espace, le pr\u00e9nom (ou le d\u00e9but du pr\u00e9nom)</td></tr><tr><td colspan=2>La recherche ne tient pas compte de la casse mais tient compte des accents !</td></tr></table>
59-
6058
Access = Autre annuaire disponible...
6159

6260
Theme = Rubrique
@@ -69,11 +67,6 @@ Consultation = Consultation
6967

7068
GroupAdd = Ajouter un groupe d'utilisateurs
7169

72-
SearchAllFields = Tous les champs
73-
SearchLastName = Nom
74-
SearchFirstName = Pr\u00e9nom
75-
SearchLastNameFirstName = Nom et/ou pr\u00e9nom
76-
7770
yellowPages.ModelList = S\u00e9lection des mod\u00e8les disponibles
7871
yellowpages.DeleteBasketContent = Vider la corbeille
7972
yellowpages.ModelUsed = Choix des mod\u00e8les utilisables

yellowpages/yellowpages-configuration/src/main/config/xmlcomponents/yellowpages.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,21 @@
104104
<message lang="en">Permet d'afficher les contacts de cette application dans l'annuaire général de la plate-forme</message>
105105
</help>
106106
</parameter>
107+
<parameter>
108+
<name>directAccess</name>
109+
<label>
110+
<message lang="fr">Accès transversal</message>
111+
<message lang="en">Transversal access</message>
112+
</label>
113+
<order>2</order>
114+
<mandatory>false</mandatory>
115+
<value>false</value>
116+
<type>checkbox</type>
117+
<updatable>always</updatable>
118+
<help>
119+
<message lang="fr">Permet d'accéder rapidement aux autres applications 'Contacts' de la plate-forme</message>
120+
<message lang="en">Allows to quickly access to others 'Contacts' applications</message>
121+
</help>
122+
</parameter>
107123
</parameters>
108124
</WAComponent>

yellowpages/yellowpages-war/src/main/java/org/silverpeas/components/yellowpages/control/DisplayContactsHelper.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.silverpeas.core.util.WebEncodeHelper;
3333
import org.silverpeas.core.util.MultiSilverpeasBundle;
3434
import org.silverpeas.core.util.StringUtil;
35-
import org.silverpeas.core.util.WebEncodeHelper;
3635
import org.silverpeas.core.web.util.viewgenerator.html.GraphicElementFactory;
3736
import org.silverpeas.core.web.util.viewgenerator.html.arraypanes.ArrayCellText;
3837
import org.silverpeas.core.web.util.viewgenerator.html.arraypanes.ArrayColumn;
@@ -53,9 +52,13 @@
5352

5453
public class DisplayContactsHelper {
5554

55+
private DisplayContactsHelper() {
56+
throw new IllegalAccessError("Utility class");
57+
}
58+
5659
public static void displayContactsAdmin(String contactCard,
5760
YellowpagesSessionController yellowpagesScc, String profile, Collection<UserContact> contacts,
58-
boolean subtopicsExist, String contactDeleteIcon, GraphicElementFactory gef,
61+
String contactDeleteIcon, GraphicElementFactory gef,
5962
ServletRequest request, HttpSession session, MultiSilverpeasBundle resources, JspWriter out)
6063
throws IOException {
6164
int indexLastNameColumn = 1;
@@ -135,6 +138,7 @@ public static void displayContactsUser(YellowpagesSessionController yellowpagesS
135138
arrayPane = gef.getArrayPane(nameArrayPane, "PrintList", request, session);
136139
arrayPane.setVisibleLineNumber(-1);
137140
}
141+
arrayPane.setExportData(true);
138142

139143
// recherche des colonnes a afficher
140144
List<String> arrayHeaders = yellowpagesScc.getArrayHeaders();
@@ -206,7 +210,7 @@ public static void displayContactsUser(YellowpagesSessionController yellowpagesS
206210
carte.setProperties(icon, "", link);
207211

208212
for (String nameColumn : properties) {
209-
if (nameColumn.equals("icon")) {
213+
if ("icon".equals(nameColumn)) {
210214
ligne.addArrayCellIconPane(iconPane);
211215
} else if ("topic".equals(nameColumn)) {
212216
ligne.addArrayCellText(WebEncodeHelper.javaStringToHtmlString(nodeName));

0 commit comments

Comments
 (0)