Skip to content

Commit a8daef3

Browse files
committed
Feature #13861
Take into account the refinement of the array pane items. Take into account renaming of a method in Administration. Take into account the new field in ST_User table: sensitiveData. Take into account email addresses of users for which privacy has been enabled aren't provided: find a way to get them for emailing them the newsletters. Ensure in WhitePages the sensitive information in user cards aren't disclosed. Take into account the indexation of such cards by removing any sensitive data for users for which privacy has been enabled.
1 parent 61deeda commit a8daef3

File tree

49 files changed

+827
-954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+827
-954
lines changed

blog/blog-war/src/main/webapp/blog/jsp/viewCategory.jsp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ function sortNode(updatedNodeJSON)
185185
<%
186186
ArrayPane arrayPane = gef.getArrayPane("categoryList", "ViewCategory", request, session);
187187
arrayPane.setSortable(false);
188-
arrayPane.setXHTML(true);
189-
arrayPane.setSortableLines(true);
188+
arrayPane.setMovableLines(true);
190189
arrayPane.addArrayColumn("&nbsp;");
191190
arrayPane.addArrayColumn(resource.getString("GML.title"));
192191
arrayPane.addArrayColumn(resource.getString("GML.description"));

community/community-library/src/integration-test/resources/community-database.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ CREATE TABLE IF NOT EXISTS ST_User
3232
state VARCHAR(30) NOT NULL,
3333
stateSaveDate TIMESTAMP NOT NULL,
3434
notifManualReceiverLimit INT,
35+
sensitiveData BOOLEAN DEFAULT FALSE NOT NULL,
3536
CONSTRAINT PK_User PRIMARY KEY (id),
3637
CONSTRAINT UN_User_1 UNIQUE (specificId, domainId),
3738
CONSTRAINT UN_User_2 UNIQUE (login, domainId),

community/community-war/src/main/webapp/community/jsp/history.jsp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,11 @@
7272
<view:window>
7373
<view:frame>
7474
<div id="history-list">
75-
<view:arrayPane title="${historyListLabel}" var="communityHistoryViewIdentifier" routingAddress="${componentUriBase}/members/history" export="true" numberLinesPerPage="25">
75+
<view:arrayPane title="${historyListLabel}"
76+
var="communityHistoryViewIdentifier"
77+
routingAddress="${componentUriBase}/members/history"
78+
numberLinesPerPage="25"
79+
export="true">
7680
<view:arrayColumn title="${lastNameLabel}" compareOn="${r -> fn:toLowerCase(r.user.lastName)}"/>
7781
<view:arrayColumn title="${firstNameLabel}" compareOn="${r -> fn:toLowerCase(r.user.firstName)}"/>
7882
<view:arrayColumn title="${statusLabel}" compareOn="${r -> fn:toLowerCase(r.getStatusLabel(currentUserLanguage))}"/>

community/community-war/src/main/webapp/community/jsp/members.jsp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,11 @@
7474
<view:window>
7575
<view:frame>
7676
<div id="members-list">
77-
<view:arrayPane title="${memberListLabel}" var="communityMemberListIdentifier" routingAddress="${componentUriBase}/members" export="true" numberLinesPerPage="25">
77+
<view:arrayPane title="${memberListLabel}"
78+
var="communityMemberListIdentifier"
79+
routingAddress="${componentUriBase}/members"
80+
numberLinesPerPage="25"
81+
export="true">
7882
<view:arrayColumn title="${lastNameLabel}" compareOn="${r -> fn:toLowerCase(r.user.lastName)}"/>
7983
<view:arrayColumn title="${firstNameLabel}" compareOn="${r -> fn:toLowerCase(r.user.firstName)}"/>
8084
<c:if test="${adminMustValidateNewMember}">

delegatednews/delegatednews-library/src/integration-test/resources/org/silverpeas/components/delegatednews/dao/create-database.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
state VARCHAR(30) NOT NULL,
4747
stateSaveDate TIMESTAMP NOT NULL,
4848
notifManualReceiverLimit INT,
49+
sensitiveData BOOLEAN DEFAULT FALSE NOT NULL,
4950
CONSTRAINT PK_User PRIMARY KEY (id),
5051
CONSTRAINT UN_User_1 UNIQUE(specificId, domainId),
5152
CONSTRAINT UN_User_2 UNIQUE(login, domainId),

delegatednews/delegatednews-library/src/integration-test/resources/org/silverpeas/components/delegatednews/service/create-database.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ CREATE TABLE IF NOT EXISTS ST_User
3030
state VARCHAR(30) NOT NULL,
3131
stateSaveDate TIMESTAMP NOT NULL,
3232
notifManualReceiverLimit INT,
33+
sensitiveData BOOLEAN DEFAULT FALSE NOT NULL,
3334
CONSTRAINT PK_User PRIMARY KEY (id),
3435
CONSTRAINT UN_User_1 UNIQUE(specificId, domainId),
3536
CONSTRAINT UN_User_2 UNIQUE(login, domainId),

delegatednews/delegatednews-war/src/main/webapp/delegatednews/jsp/listNews.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
<%
288288
ArrayPane arrayPane = gef.getArrayPane("newsList", "Main", request, session);
289289
arrayPane.setVisibleLineNumber(1000);
290-
arrayPane.setSortableLines(true);
290+
arrayPane.setMovableLines(true);
291291
arrayPane.setTitle(resources.getString("delegatednews.listNews"));
292292
arrayPane.addArrayColumn(resources.getString("delegatednews.news.title"));
293293
ArrayColumn column = arrayPane.addArrayColumn(resources.getString("delegatednews.updateDate"));

formsOnline/formsOnline-library/src/integration-test/resources/org/silverpeas/components/formsonline/model/create-database.sql

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,6 @@ CREATE TABLE ST_User
109109
expirationDate TIMESTAMP,
110110
state VARCHAR(30) NOT NULL,
111111
stateSaveDate TIMESTAMP NOT NULL,
112-
notifManualReceiverLimit INT
112+
notifManualReceiverLimit INT,
113+
sensitiveData BOOLEAN DEFAULT FALSE NOT NULL
113114
);

formsOnline/formsOnline-war/src/main/java/org/silverpeas/components/formsonline/control/TitleHelper.java

Lines changed: 0 additions & 99 deletions
This file was deleted.

infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/implementation/InfoLetterDataManager.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -252,24 +252,24 @@ public void updateInfoLetterPublication(InfoLetterPublicationPdC ilp) {
252252

253253
@Override
254254
public InfoLetter getInfoLetter(WAPrimaryKey letterPK) {
255-
InfoLetter retour;
255+
InfoLetter infoLetter;
256256
try {
257-
retour = infoLetterDAO.findByPrimaryKey(letterPK);
257+
infoLetter = infoLetterDAO.findByPrimaryKey(letterPK);
258258
} catch (PersistenceException pe) {
259259
throw new InfoLetterException(pe);
260260
}
261-
return retour;
261+
return infoLetter;
262262
}
263263

264264
@Override
265265
public InfoLetterPublicationPdC getInfoLetterPublication(WAPrimaryKey publiPK) {
266-
InfoLetterPublicationPdC retour;
266+
InfoLetterPublicationPdC classifiedPublic;
267267
try {
268-
retour = new InfoLetterPublicationPdC(infoLetterPublicationDAO.findByPrimaryKey(publiPK));
268+
classifiedPublic = new InfoLetterPublicationPdC(infoLetterPublicationDAO.findByPrimaryKey(publiPK));
269269
} catch (PersistenceException pe) {
270270
throw new InfoLetterException(pe);
271271
}
272-
return retour;
272+
return classifiedPublic;
273273
}
274274

275275
@Override
@@ -358,7 +358,7 @@ public void setInternalSuscribers(final String componentId, final UserDetail[] u
358358

359359
@Override
360360
public Set<String> getEmailsExternalsSuscribers(WAPrimaryKey letterPK) {
361-
Set<String> retour = new LinkedHashSet<>();
361+
Set<String> emails = new LinkedHashSet<>();
362362
try (Connection con = openConnection()) {
363363
InfoLetter letter = getInfoLetter(letterPK);
364364
String selectQuery =
@@ -369,14 +369,14 @@ public Set<String> getEmailsExternalsSuscribers(WAPrimaryKey letterPK) {
369369
//noinspection SqlSourceToSinkFlow
370370
try (ResultSet rs = selectStmt.executeQuery(selectQuery)) {
371371
while (rs.next()) {
372-
retour.add(rs.getString("email"));
372+
emails.add(rs.getString("email"));
373373
}
374374
}
375375
}
376376
} catch (Exception e) {
377377
throw new InfoLetterException(e);
378378
}
379-
return retour;
379+
return emails;
380380
}
381381

382382
@Transactional

infoLetter/infoLetter-library/src/main/java/org/silverpeas/components/infoletter/model/InfoLetterPublicationPdC.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,6 @@ public class InfoLetterPublicationPdC extends InfoLetterPublication
4040
implements SilverContentInterface {
4141
private static final long serialVersionUID = -2174573301215680444L;
4242
public static final String TYPE = "publication";
43-
/**
44-
* icone d'une publication
45-
*/
46-
private String iconUrl = "infoLetterSmall.gif";
4743

4844
private String silverObjectId;
4945
private String positions;
@@ -105,7 +101,10 @@ public String getCreatorId() {
105101

106102
@Override
107103
public String getIconUrl() {
108-
return iconUrl;
104+
/*
105+
* publication icon
106+
*/
107+
return "infoLetterSmall.gif";
109108
}
110109

111110
@Override

0 commit comments

Comments
 (0)