Skip to content

Commit c0bfada

Browse files
committed
Merge branch 'release-1.2.1'
2 parents 7f4ea3a + bf72ea0 commit c0bfada

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,12 @@ update taxon set ordering = 7 where common_name = "yeast";
331331
update taxon set ordering = 8 where common_name = "e. coli";
332332
```
333333

334+
### New FAQs
335+
336+
There are new categories talking about the now available privacy and sharing options. You can use our updated
337+
faq file (see the faq.properties file in our github repository), or add the new categories manually to your existing file.
338+
339+
334340
### Start the application
335341

336342
After finishing all the steps, you can start your RDMM application again and test if everything works as expected.

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>ubc.pavlab</groupId>
77
<artifactId>rdp</artifactId>
8-
<version>1.2.0</version>
8+
<version>1.2.1</version>
99

1010
<parent>
1111
<groupId>org.springframework.boot</groupId>

src/main/java/ubc/pavlab/rdp/services/UserServiceImpl.java

-2
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,6 @@ public List<String> getChars() {
464464
Set<String> chars = new HashSet<>();
465465
for ( User u : users ) {
466466
if ( checkCurrentUserCanSee( u ) ) {
467-
if ( u.getProfile().getName() != null && !u.getProfile().getName().isEmpty() )
468-
chars.add( u.getProfile().getName().substring( 0, 1 ).toUpperCase() );
469467
if ( u.getProfile().getLastName() != null && !u.getProfile().getLastName().isEmpty() )
470468
chars.add( u.getProfile().getLastName().substring( 0, 1 ).toUpperCase() );
471469
}

0 commit comments

Comments
 (0)