Fix keyword expression editor for 'devel' tracker template.

stefanseefeld · stefanseefeld · commit 1b6b418256e0 · 2011-04-21T15:30:17.000Z
diff --git a/share/roundup/templates/devel/html/_generic.keywords_expr.html b/share/roundup/templates/devel/html/_generic.keywords_expr.html
@@ -0,0 +1,11 @@
+<!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/help.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>
diff --git a/share/roundup/templates/devel/html/bug.search.html b/share/roundup/templates/devel/html/bug.search.html
@@ -23,6 +23,7 @@
    sort_input templates/page/macros/sort_input;
    group_input templates/page/macros/group_input;
    search_select templates/page/macros/search_select;
+   search_select_keywords templates/page/macros/search_select_keywords;
    search_select_translated templates/page/macros/search_select_translated;
    search_multiselect templates/page/macros/search_multiselect;">
 
@@ -187,11 +188,11 @@
   <td metal:use-macro="group_input"></td>
 </tr>
 
-<tr tal:define="name string:keywords;
+<tr tal:define="name string:keyword;
                 db_klass string:keyword;
                 db_content string:name;">
   <th i18n:translate="">Keyword:</th>
-  <td metal:use-macro="search_select_translated">
+  <td metal:use-macro="search_select_keywords">
     <option metal:fill-slot="extra_options" value="-1" i18n:translate=""
             tal:attributes="selected python:value == '-1'">not set</option>
   </td>
diff --git a/share/roundup/templates/devel/html/page.html b/share/roundup/templates/devel/html/page.html
@@ -308,6 +308,7 @@ <h1 id="breadcrumb"><span metal:define-slot="body_title">body title</span></h1>
 </td>
 
 <td metal:define-macro="search_select_keywords">
+  <div tal:attributes="id python:'''keywords_%s'''%name">
   <select tal:attributes="name name; id name"
           tal:define="value python:request.form.getvalue(name)">
     <option value="" i18n:translate="">don't care</option>
@@ -318,7 +319,8 @@ <h1 id="breadcrumb"><span metal:define-slot="body_title">body title</span></h1>
             tal:content="python:s[db_content]"></option>
   </select>
   <a class="classhelp"
-	 tal:attributes="href python:'''javascript:help_window('task?@template=&property=%s&form=itemSynopsis', 300, 200)'''%name">(edit)</a>
+	 tal:attributes="href python:'''javascript:help_window('%s?@template=keywords_expr&property=%s&form=itemSynopsis', 300, 200)'''%(request.classname, name)">(edit)</a>
+  </div>
 </td>
 
 <!-- like search_select, but translates the further values.
diff --git a/share/roundup/templates/devel/html/task.search.html b/share/roundup/templates/devel/html/task.search.html
@@ -23,6 +23,7 @@
    sort_input templates/page/macros/sort_input;
    group_input templates/page/macros/group_input;
    search_select templates/page/macros/search_select;
+   search_select_keywords templates/page/macros/search_select_keywords;
    search_select_translated templates/page/macros/search_select_translated;
    search_multiselect templates/page/macros/search_multiselect;">
 
@@ -191,7 +192,7 @@
                 db_klass string:keyword;
                 db_content string:name;">
   <th i18n:translate="">Keyword:</th>
-  <td metal:use-macro="search_select_translated">
+  <td metal:use-macro="search_select_keywords">
     <option metal:fill-slot="extra_options" value="-1" i18n:translate=""
             tal:attributes="selected python:value == '-1'">not set</option>
   </td>
