##// END OF EJS Templates
webcommands: move nonempty logic from JavaScript to Python...
Martin Geisler -
r8236:9f53e203 default
parent child Browse files
Show More
@@ -646,7 +646,7 b' def graph(web, req, tmpl):'
646 node = short(ctx.node())
646 node = short(ctx.node())
647 age = templatefilters.age(ctx.date())
647 age = templatefilters.age(ctx.date())
648 desc = templatefilters.firstline(ctx.description())
648 desc = templatefilters.firstline(ctx.description())
649 desc = cgi.escape(desc)
649 desc = cgi.escape(templatefilters.nonempty(desc))
650 user = cgi.escape(templatefilters.person(ctx.user()))
650 user = cgi.escape(templatefilters.person(ctx.user()))
651 branch = ctx.branch()
651 branch = ctx.branch()
652 branch = branch, web.repo.branchtags().get(branch) == ctx.node()
652 branch = branch, web.repo.branchtags().get(branch) == ctx.node()
@@ -78,10 +78,7 b' graph.vertex = function(x, y, color, par'
78 item = item.replace(/_PARITY/, 'parity' + parity);
78 item = item.replace(/_PARITY/, 'parity' + parity);
79 item = item.replace(/_NODEID/, cur[0]);
79 item = item.replace(/_NODEID/, cur[0]);
80 item = item.replace(/_NODEID/, cur[0]);
80 item = item.replace(/_NODEID/, cur[0]);
81 if (cur[3] != '')
81 item = item.replace(/_DESC/, cur[3]);
82 item = item.replace(/_DESC/, cur[3]);
83 else
84 item = item.replace(/_DESC/, '(none)');
85 item = item.replace(/_USER/, cur[4]);
82 item = item.replace(/_USER/, cur[4]);
86 item = item.replace(/_DATE/, cur[5]);
83 item = item.replace(/_DATE/, cur[5]);
87
84
@@ -75,10 +75,7 b''
75 item = item.replace(/_PARITY/, 'parity' + parity);
75 item = item.replace(/_PARITY/, 'parity' + parity);
76 item = item.replace(/_NODEID/, cur[0]);
76 item = item.replace(/_NODEID/, cur[0]);
77 item = item.replace(/_NODEID/, cur[0]);
77 item = item.replace(/_NODEID/, cur[0]);
78 if (cur[3] != '')
78 item = item.replace(/_DESC/, cur[3]);
79 item = item.replace(/_DESC/, cur[3]);
80 else
81 item = item.replace(/_DESC/, '(none)');
82 item = item.replace(/_USER/, cur[4]);
79 item = item.replace(/_USER/, cur[4]);
83 item = item.replace(/_DATE/, cur[5]);
80 item = item.replace(/_DATE/, cur[5]);
84
81
@@ -86,10 +86,7 b' graph.vertex = function(x, y, color, par'
86 item = item.replace(/_PARITY/, 'parity' + parity);
86 item = item.replace(/_PARITY/, 'parity' + parity);
87 item = item.replace(/_NODEID/, cur[0]);
87 item = item.replace(/_NODEID/, cur[0]);
88 item = item.replace(/_NODEID/, cur[0]);
88 item = item.replace(/_NODEID/, cur[0]);
89 if (cur[3] != '')
89 item = item.replace(/_DESC/, cur[3]);
90 item = item.replace(/_DESC/, cur[3]);
91 else
92 item = item.replace(/_DESC/, '(none)');
93 item = item.replace(/_USER/, cur[4]);
90 item = item.replace(/_USER/, cur[4]);
94 item = item.replace(/_DATE/, cur[5]);
91 item = item.replace(/_DATE/, cur[5]);
95
92
@@ -70,10 +70,7 b' graph.vertex = function(x, y, color, par'
70 item = item.replace(/_PARITY/, 'parity' + parity);
70 item = item.replace(/_PARITY/, 'parity' + parity);
71 item = item.replace(/_NODEID/, cur[0]);
71 item = item.replace(/_NODEID/, cur[0]);
72 item = item.replace(/_NODEID/, cur[0]);
72 item = item.replace(/_NODEID/, cur[0]);
73 if (cur[3] != '')
73 item = item.replace(/_DESC/, cur[3]);
74 item = item.replace(/_DESC/, cur[3]);
75 else
76 item = item.replace(/_DESC/, '(none)');
77 item = item.replace(/_USER/, cur[4]);
74 item = item.replace(/_USER/, cur[4]);
78 item = item.replace(/_DATE/, cur[5]);
75 item = item.replace(/_DATE/, cur[5]);
79
76
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -230,10 +230,7 b' graph.vertex = function(x, y, color, par'
230 item = item.replace(/_PARITY/, 'parity' + parity);
230 item = item.replace(/_PARITY/, 'parity' + parity);
231 item = item.replace(/_NODEID/, cur[0]);
231 item = item.replace(/_NODEID/, cur[0]);
232 item = item.replace(/_NODEID/, cur[0]);
232 item = item.replace(/_NODEID/, cur[0]);
233 if (cur[3] != '')
233 item = item.replace(/_DESC/, cur[3]);
234 item = item.replace(/_DESC/, cur[3]);
235 else
236 item = item.replace(/_DESC/, '(none)');
237 item = item.replace(/_USER/, cur[4]);
234 item = item.replace(/_USER/, cur[4]);
238 item = item.replace(/_DATE/, cur[5]);
235 item = item.replace(/_DATE/, cur[5]);
239
236
General Comments 0
You need to be logged in to leave comments. Login now