Fixed quick filters with MOptions

SVN revision: 1613
This commit is contained in:
2006-01-18 11:14:08 +00:00
parent d90f72db11
commit 9ef325e085
+25
View File
@@ -16485,6 +16485,13 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
}
}
/* search for parameter without '_' coming from quick filter */
if (isparam(attr_list[i])) {
searched = TRUE;
if (strstr(attrib[i], getparam(attr_list[i])))
found = TRUE;
}
if (searched && !found)
break;
@@ -16974,6 +16981,8 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
sprintf(str, "%s_%d", attr_list[i], j);
if (isparam(str))
disp_filter = TRUE;
if (isparam(attr_list[i]))
disp_filter = TRUE;
}
}
}
@@ -17090,6 +17099,22 @@ void show_elog_list(LOGBOOK * lbs, int past_n, int last_n, int page_n, BOOL defa
}
}
if (isparam(attr_list[i])) {
comment[0] = 0;
if (attr_flags[i] & AF_ICON) {
sprintf(str, "Icon comment %s", getparam(attr_list[i]));
getcfg(lbs->name, str, comment, sizeof(comment));
}
if (line[0])
strlcat(line, " | ", sizeof(line));
if (comment[0] == 0)
strlcat(line, getparam(attr_list[i]), sizeof(line));
else
strlcat(line, comment, sizeof(line));
}
if (line[0]) {
rsprintf("<tr><td nowrap width=\"10%%\" class=\"attribname\">%s:</td>", attr_list[i]);
rsprintf("<td class=\"attribvalue\"><span style=\"color:black;background-color:#ffff66\">");