Fix search template for printer/class/job pages (STR #3132)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@8464 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES.txt b/CHANGES.txt
index 0cdc81015e9192c69684bd2a2abc37e3ac072ae2..6c847e879b121864d2c7b5a92340124a10dff6f4 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,9 +1,11 @@
-CHANGES.txt - 2009-03-20
+CHANGES.txt - 2009-03-23
 ------------------------
 
 CHANGES IN CUPS V1.4b3
 
        - Documentation fixes (STR #3044, STR #3057)
+       - The printer/class/job search feature on the web interface did not
+         work (STR #3132)
        - The scheduler did not write the printers out for classes.
        - CUPS-Get-PPDs did not work properly when filtering by language,
          product, or psversion (STR #3136)

diff --git a/templates/es/search.tmpl b/templates/es/search.tmpl
index 8d812a3b694ada56c75138423047f007a93b4c0d..3f430689c341afc87de99134ce901b3f970329f4 100755 (executable)
--- a/templates/es/search.tmpl
+++ b/templates/es/search.tmpl
@@ -1,4 +1,4 @@
-<FORM ACTION="{THIS_URL}" METHOD="GET">
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
 {WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
 {ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
 

diff --git a/templates/ja/search.tmpl b/templates/ja/search.tmpl
index 1f1431aad875ed17cf81ea4ba7f995ec34f3cc91..3e819952cda0d2435e8afd6ed229937ad505c5e2 100644 (file)
--- a/templates/ja/search.tmpl
+++ b/templates/ja/search.tmpl
@@ -1,4 +1,4 @@
-<FORM ACTION="{THIS_URL}" METHOD="GET">
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
 {WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
 {ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
 

diff --git a/templates/pl/search.tmpl b/templates/pl/search.tmpl
index 593071a7988654e199c0b3de857eaad4e398a4c1..0851d85166272829602c9182ea6c07e2e2feae06 100644 (file)
--- a/templates/pl/search.tmpl
+++ b/templates/pl/search.tmpl
@@ -1,4 +1,4 @@
-<FORM ACTION="{THIS_URL}" METHOD="GET">
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
 {WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
 {ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
 

diff --git a/templates/ru/search.tmpl b/templates/ru/search.tmpl
index 80dbf8ee1d2bc82f1867b9e2f57e87fc6a193ac1..64266599db71491d526f48639825c86ba25692c3 100644 (file)
--- a/templates/ru/search.tmpl
+++ b/templates/ru/search.tmpl
@@ -1,4 +1,4 @@
-<FORM ACTION="{THIS_URL}" METHOD="GET">
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
 {WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
 {ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
 

diff --git a/templates/search.tmpl b/templates/search.tmpl
index 9e05e6ecb5d0380843fe2dfee2015fbe1ab4f87b..755269ea37c268e494f3485b8180a76cf7208d01 100644 (file)
--- a/templates/search.tmpl
+++ b/templates/search.tmpl
@@ -1,4 +1,4 @@
-<FORM ACTION="{THIS_URL}" METHOD="GET">
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
 {WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
 {ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}