[Python-checkins] r88877 - in tracker: instances/python-dev/html/_generic.keywords_expr.html instances/python-dev/html/issue.search.html instances/python-dev/html/page.html roundup-src/roundup/cgi/KeywordsExpr.py

Sun Aug 7 16:11:41 CEST 2011

Author: ezio.melotti
Date: Sun Aug 7 16:11:41 2011
New Revision: 88877
Log:
Fix the new keyword(s) search.
Modified:
 tracker/instances/python-dev/html/_generic.keywords_expr.html
 tracker/instances/python-dev/html/issue.search.html
 tracker/instances/python-dev/html/page.html
 tracker/roundup-src/roundup/cgi/KeywordsExpr.py
Modified: tracker/instances/python-dev/html/_generic.keywords_expr.html
==============================================================================

--- tracker/instances/python-dev/html/_generic.keywords_expr.html	(original)
+++ tracker/instances/python-dev/html/_generic.keywords_expr.html	Sun Aug 7 16:11:41 2011
@@ -9,36 +9,3 @@
 tal:content="structure python:utils.keywords_expressions(request)">
 </body>
 </html>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
- <head>
- <link rel="stylesheet" type="text/css" href="@@file/style.css" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8;" />
- <title tal:content="string:Roundup Keywords Expression Editor"></title>
- </head>
- <body class="body"
- tal:content="structure python:utils.keywords_expressions(request)">
- </body>
-</html>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
- <head>
- <link rel="stylesheet" type="text/css" href="@@file/style.css" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8;" />
- <title tal:content="string:Roundup Keywords Expression Editor"></title>
- </head>
- <body class="body"
- tal:content="structure python:utils.keywords_expressions(request)">
- </body>
-</html>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
- <head>
- <link rel="stylesheet" type="text/css" href="@@file/style.css" />
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8;" />
- <title tal:content="string:Roundup Keywords Expression Editor"></title>
- </head>
- <body class="body"
- tal:content="structure python:utils.keywords_expressions(request)">
- </body>
-</html>
Modified: tracker/instances/python-dev/html/issue.search.html
==============================================================================
--- tracker/instances/python-dev/html/issue.search.html	(original)
+++ tracker/instances/python-dev/html/issue.search.html	Sun Aug 7 16:11:41 2011
@@ -209,7 +209,7 @@
 <td metal:use-macro="group_input"></td>
 </tr>
 
-<tr tal:define="name string:keyword;
+<tr tal:define="name string:keywords;
 db_klass string:keyword;
 db_content string:name;">
 <th i18n:translate="">Keyword:</th>
Modified: tracker/instances/python-dev/html/page.html
==============================================================================
--- tracker/instances/python-dev/html/page.html	(original)
+++ tracker/instances/python-dev/html/page.html	Sun Aug 7 16:11:41 2011
@@ -348,8 +348,8 @@
 </td>
 
 <td metal:define-macro="search_select_keywords">
- <div tal:attributes="id python:'''keywords_%s'''%name">
- <select tal:attributes="name name; id name"
+ <div id="keywords_keyword">
+ <select name="keywords" id="keywords"
 tal:define="value python:request.form.getvalue(name)">
 <option value="" i18n:translate="">don't care</option>
 <metal:slot define-slot="extra_options" />
@@ -359,7 +359,7 @@
 tal:content="python:s[db_content]"></option>
 </select>
 <a class="classhelp"
- tal:attributes="href python:'''javascript:help_window('issue?@template=keywords_expr&property=%s&form=itemSynopsis', 350, 200)'''%name">(expr)</a>
+ href="javascript:help_window('issue?@template=keywords_expr&property=keyword&form=itemSynopsis', 500, 200)">(expr)</a>
 </div>
 </td>
 
Modified: tracker/roundup-src/roundup/cgi/KeywordsExpr.py
==============================================================================
--- tracker/roundup-src/roundup/cgi/KeywordsExpr.py	(original)
+++ tracker/roundup-src/roundup/cgi/KeywordsExpr.py	Sun Aug 7 16:11:41 2011
@@ -119,7 +119,7 @@
 }
 
 function render_select(handler) {
- var out = '<select name="keyword" id="keyword"';
+ var out = '<select name="keywords" id="keywords"';
 if (handler != null) {
 out += ' onchange="' + handler + '"';
 }
@@ -134,7 +134,7 @@
 }
 
 function first_select() {
- var value = document.getElementById("keyword").value;
+ var value = document.getElementById("keywords").value;
 current = value;
 set_content();
 }
@@ -157,7 +157,7 @@
 function and_clicked() {
 var expr = parse(current);
 if (expr == null) return;
- var value = document.getElementById("keyword").value;
+ var value = document.getElementById("keywords").value;
 if (value == "-1") return;
 undo.push(current);
 current = new And(expr, not_b_wrap(new Equals(value))).postfix();
@@ -167,7 +167,7 @@
 function or_clicked() {
 var expr = parse(current);
 if (expr == null) return;
- var value = document.getElementById("keyword").value;
+ var value = document.getElementById("keywords").value;
 if (value == "-1") return;
 undo.push(current);
 current = new Or(expr, not_b_wrap(new Equals(value))).postfix();
@@ -182,7 +182,7 @@
 }
 
 function enable_and_or() {
- var value = document.getElementById("keyword").value;
+ var value = document.getElementById("keywords").value;
 value = value == "-1";
 document.getElementById("and").disabled = value;
 document.getElementById("or").disabled = value;
@@ -222,7 +222,7 @@
 
 function main_content() {
 var out = '';
- out += '<input type="hidden" name="%(prop)s" value="' + current + '"\/>';
+ out += '<input type="hidden" name="keywords" value="' + current + '"\/>';
 out += parse(current).infix();
 return out;
 }
