Remove ¶ char in diff & fix ProjectMemberRemoved (#592)

SpongePowered · Jul 31, 2018 · bf8466b · bf8466b
1 parent 887e086
commit bf8466b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/project/Projects.scala b/app/controllers/project/Projects.scala
@@ -517,7 +517,7 @@ class Projects @Inject()(stats: StatTracker,
       val project = request.data.project
       project.memberships.removeMember(user)
       UserActionLogger.log(request.request, LoggedAction.ProjectMemberRemoved, project.id.getOrElse(-1),
-        s"'$user.name' is not a member of ${project.ownerName}/${project.name}", s"'$user.name' is a member of ${project.ownerName}/${project.name}")
+        s"'${user.name}' is not a member of ${project.ownerName}/${project.name}", s"'${user.name}' is a member of ${project.ownerName}/${project.name}")
       Redirect(self.showSettings(author, slug))
     }
 

diff --git a/public/javascripts/actionLog.js b/public/javascripts/actionLog.js
@@ -28,7 +28,7 @@ $('body').on('click', '.data-diff', function() {
     var textDiff = diff.diff_main($('textarea[data-oldstate="' + idToDiff + '"]').val(), $('textarea[data-newstate="' + idToDiff + '"]').val());
     diff.diff_cleanupSemantic(textDiff);
 
-    $('#modal-view-body').html(diff.diff_prettyHtml(textDiff));
+    $('#modal-view-body').html(diff.diff_prettyHtml(textDiff).replace(/&para;/g, ''));
     $('#modal-view').modal('show');
 
 }).on('click', '.data-view-old', function() {