|
 |
8394b4 |
From 82b5436598848d6870174d04f1c3a5cf702c1508 Mon Sep 17 00:00:00 2001
|
|
|
8394b4 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
8394b4 |
Date: Wed, 11 Dec 2019 15:42:22 -0500
|
|
|
8394b4 |
Subject: [PATCH] Issue 50780 - Fix UI issues
|
|
|
8394b4 |
|
|
|
8394b4 |
Description: Fixed issue with replication conflict entry modal, and
|
|
|
8394b4 |
problem with the monitor's replication and suffix
|
|
|
8394b4 |
state data collision that caused a crash if you first
|
|
|
8394b4 |
looked at replication and then the suffix monitor
|
|
|
8394b4 |
|
|
|
8394b4 |
relates: https://pagure.io/389-ds-base/issue/50780
|
|
|
8394b4 |
|
|
|
8394b4 |
Reviewed by: spichugi(Thanks!)
|
|
|
8394b4 |
---
|
|
|
8394b4 |
src/lib389/lib389/replica.py | 2 +-
|
|
|
8394b4 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
8394b4 |
|
|
|
8394b4 |
diff --git a/src/lib389/lib389/replica.py b/src/lib389/lib389/replica.py
|
|
|
8394b4 |
index 9b84d8f7e..4855f03f0 100644
|
|
|
8394b4 |
--- a/src/lib389/lib389/replica.py
|
|
|
8394b4 |
+++ b/src/lib389/lib389/replica.py
|
|
|
8394b4 |
@@ -1169,7 +1169,7 @@ class Replica(DSLdapObject):
|
|
|
8394b4 |
if len(conflicts) > 0:
|
|
|
8394b4 |
report = copy.deepcopy(DSREPLLE0002)
|
|
|
8394b4 |
report['detail'] = report['detail'].replace('SUFFIX', suffix)
|
|
|
8394b4 |
- report['detail'] = report['detail'].replace('COUNT', len(conflicts))
|
|
|
8394b4 |
+ report['detail'] = report['detail'].replace('COUNT', str(len(conflicts)))
|
|
|
8394b4 |
report['fix'] = report['fix'].replace('YOUR_INSTANCE', self._instance.serverid)
|
|
|
8394b4 |
yield report
|
|
|
8394b4 |
|
|
|
8394b4 |
--
|
|
|
8394b4 |
2.24.1
|
|
|
8394b4 |
|