Skip to content

Commit

Permalink
Merge pull request finos#6787 from davidwatkins73/master
Browse files Browse the repository at this point in the history
 1.54 pre-release testing minor fixes
  • Loading branch information
davidwatkins73 authored Sep 27, 2023
2 parents 50cdd08 + 59eb6ea commit ce21098
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<br>
</div>
<div class="waltz-sub-section-controls">
<waltz-data-extract-link name="Licences"
<waltz-data-extract-link name="Export Licences"
styling="link"
filename="licences.csv"
extract="licences/{{$ctrl.parentEntityRef.kind}}/{{$ctrl.parentEntityRef.id}}">
Expand Down
5 changes: 4 additions & 1 deletion waltz-ng/client/user/active-users.html
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@
<div>
<h4>
Active Users
<small>in the last <span ng-bind="ctrl.selectedDuration"></span> minutes</small>
<small>
in the last <span ng-bind="ctrl.selectedDuration"></span> minutes
(# <span ng-bind="ctrl.activeUsers.length"></span>)
</small>
</h4>

<div ng-if="ctrl.activeUsers.length > 0" class="waltz-user-log-scroll">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class BookmarkCreationAndRemovalIntegrationTest extends BasePlaywrightInt


@BeforeEach
public void setupAssessmentData() throws IOException {
public void setupBookmarkData() throws IOException {
appRef = appHelper.createNewApp(
mkName("test_app_bookmarks"),
10L);
Expand All @@ -43,7 +43,7 @@ public void setupAssessmentData() throws IOException {


@Test
public void addAndRemoveAssessment() {
public void addAndRemoveBookmark() {
createBookmark("Test bookmark");
removeBookmark();
}
Expand Down

0 comments on commit ce21098

Please sign in to comment.