Comment on duplication of code/markup found during styling project.

diff --git a/src/allmydata/web/check_results.py b/src/allmydata/web/check_results.py
index ee3ea8c8de7968d56fd4e6ba8e1646ed0bdafb25..6eaf4be4e3c66f71298152fbc2beafbedd9c0f83 100644 (file)
--- a/src/allmydata/web/check_results.py
+++ b/src/allmydata/web/check_results.py
@@ -109,6 +109,8 @@ class ResultsBase:
         sharemap = []
         servers = {}
 
+        # FIXME: The two tables below contain nickname-and-nodeid table column markup which is duplicated with each other, introducer.xhtml, and deep-check-results.xhtml. All of these (and any other presentations of nickname-and-nodeid) should be combined.
+
         for shareid in sorted(data["sharemap"].keys()):
             serverids = data["sharemap"][shareid]
             for i,serverid in enumerate(serverids):

diff --git a/src/allmydata/web/introweb.py b/src/allmydata/web/introweb.py
index 14b01266121b24e6c0f7398b205ae7f4b5553e82..27edbcbb4fb0f526c71bc3d75e5968b11fe45f2f 100644 (file)
--- a/src/allmydata/web/introweb.py
+++ b/src/allmydata/web/introweb.py
@@ -64,6 +64,7 @@ class IntroducerRoot(rend.Page):
 
         return simplejson.dumps(res, indent=1) + "\n"
 
+    # FIXME: This code is duplicated in root.py and introweb.py.
     def data_version(self, ctx, data):
         return get_package_versions_string()
     def data_import_path(self, ctx, data):

diff --git a/src/allmydata/web/root.py b/src/allmydata/web/root.py
index 4d8d2c2dc272a48134c5452a2300e76c86f374c6..b84f76f61e97416c992461763ed3d61366e0cec2 100644 (file)
--- a/src/allmydata/web/root.py
+++ b/src/allmydata/web/root.py
@@ -177,6 +177,7 @@ class Root(rend.Page):
     child_report_incident = IncidentReporter()
     #child_server # let's reserve this for storage-server-over-HTTP
 
+    # FIXME: This code is duplicated in root.py and introweb.py.
     def data_version(self, ctx, data):
         return get_package_versions_string()
     def data_import_path(self, ctx, data):