From: Kevin Reid Date: Sun, 3 May 2009 20:34:42 +0000 (-0700) Subject: Comment on duplication of code/markup found during styling project. X-Git-Tag: trac-3900~18 X-Git-Url: https://git.rkrishnan.org/...?a=commitdiff_plain;h=3e80676a299fe3ed5212e4e89dcf8c6869f96437;p=tahoe-lafs%2Ftahoe-lafs.git 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 ee3ea8c8..6eaf4be4 100644 --- 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 14b01266..27edbcbb 100644 --- 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 4d8d2c2d..b84f76f6 100644 --- 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):