Merge branch 'master' of ssh://gitorious.org/yacy/rc1

pull/1/head
Michael Peter Christen 11 years ago
commit 745d6d1c64

@ -85,7 +85,7 @@ document.write("<div id=\"api\">\<a href=\"api/table_p.xml" + window.location.se
#{list}# #{list}#
<tr class="TableCell#(dark)#Light::Dark::Summary#(/dark)#"> <tr class="TableCell#(dark)#Light::Dark::Summary#(/dark)#">
<td align="left"><input type="checkbox" name="item_#[count]#" value="pk_#[pk]#" /></td> <td align="left"><input type="checkbox" name="item_#[count]#" value="pk_#[pk]#" /></td>
<td>#[pk]#</td> <td><a href="Tables_p.html?editrow=pk_#[pk]#&table=#[table]#">#[pk]#</a></td>
#{columns}# #{columns}#
<td align="left">#[cell]#</td> <td align="left">#[cell]#</td>
#{/columns}# #{/columns}#

@ -172,6 +172,7 @@ public class Tables_p {
prop.put("showtable_list_" + count + "_dark", ((dark) ? 1 : 0) ); dark=!dark; prop.put("showtable_list_" + count + "_dark", ((dark) ? 1 : 0) ); dark=!dark;
prop.put("showtable_list_" + count + "_pk", UTF8.String(row.getPK())); prop.put("showtable_list_" + count + "_pk", UTF8.String(row.getPK()));
prop.put("showtable_list_" + count + "_count", count); prop.put("showtable_list_" + count + "_count", count);
prop.put("showtable_list_" + count + "_table", table); // tablename for edit link
for (int i = 0; i < columns.size(); i++) { for (int i = 0; i < columns.size(); i++) {
cell = row.get(columns.get(i)); cell = row.get(columns.get(i));
prop.putHTML("showtable_list_" + count + "_columns_" + i + "_cell", cell == null ? "" : UTF8.String(cell)); prop.putHTML("showtable_list_" + count + "_columns_" + i + "_cell", cell == null ? "" : UTF8.String(cell));

Loading…
Cancel
Save