Changeset 1241


Ignore:
Timestamp:
12/21/06 14:33:39 (13 years ago)
Author:
jukka
Message:

Fixed #1051, spent 2h. Also went through all topics and checked they are ok.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/SectionFolder.py

    r1234 r1241  
    217217            filter=queries.pop('filter') 
    218218        else:  
    219             filter=None 
     219            filter='' 
    220220        if queries.has_key('b_start'): 
    221221            batch_start=queries.pop('b_start') 
  • trunk/skins/lemill/lemill_browse_macros.pt

    r1227 r1241  
    7575            type_nicename python:wrw[typename][1].lower(); 
    7676            searchterm python:test(topic_name=='published', {'Creator':member}, searchterm); 
     77            searchterm_list python:[x for x in searchterm.items() if x[0]!='filter'];             
    7778            "> 
    7879        <tal:worth_listing condition="python:results_n>0"> 
     
    8081                tal:attributes="href python: '%s?%s%s' % (url, request_opened['search_url'],add_filter)"> 
    8182        <span i18n:translate="" tal:content="string:Browse ${type_nicename} where"/> 
    82                 <tal:loop tal:omit-tag="" tal:repeat="si searchterm/items"> 
     83                <tal:loop tal:omit-tag="" tal:repeat="si searchterm_list"> 
    8384        <span i18n:translate="text_field_is_value"> 
    8485                 <span i18n:name="field"><span tal:omit-tag="" i18n:translate="" tal:content="python:searchterm_nice[si[0]].lower()">Field</span></span> is 
  • trunk/skins/lemill/lemill_browse_results.pt

    r1229 r1241  
    1919                 full_url string:$here_url?${request_opened/search_url}; 
    2020                 cont_url string:$here_url${request_opened/cont_url}; 
    21                  filter request_opened/filter | nothing; 
     21                 filter request_opened/filter; 
    2222                 searchterm_nice request_opened/searchterm_nice; 
    2323                 value_nice request_opened/value_nice; 
     
    3939                 results folderContents|request/results|nothing; 
    4040                 results python:here.filterContent(results, filter); 
    41                  browsed_stuff python:here.getBrowsedStuff(topic_name); 
     41                 browsed_stuff python:here.getBrowsedStuff(here.id); 
    4242                 "> 
    4343 
     
    5252     </div> 
    5353 
    54         <tal:filter_link metal:use-macro="here/lemill_browse_macros/macros/filter_links" tal:condition="python:parent_folder=='content' or filter in ('pieces','references','resources')"/> 
     54     <tal:show_filters condition="python:parent_folder=='content' or filter in ('pieces','references','resources')"> 
     55        <tal:filter_link metal:use-macro="here/lemill_browse_macros/macros/filter_links" /> 
     56     </tal:show_filters> 
    5557 
    5658     <fieldset tal:condition="results"> 
     
    8082    <div tal:condition="not:do_tagcloud" tal:omit-tag=""> 
    8183      <fieldset style="border-width:0px"> 
    82      
    83        <tal:filter_link metal:use-macro="here/lemill_browse_macros/macros/filter_links" tal:condition="python:parent_folder=='content' or filter in ('pieces','references','resources')"/> 
     84 
     85       <tal:show_filters condition="python:parent_folder=='content' or filter in ('pieces','references','resources')">     
     86        <tal:filter_link metal:use-macro="here/lemill_browse_macros/macros/filter_links" tal:condition="python:parent_folder=='content' "/> 
     87       </tal:show_filters> 
    8488 
    8589       <div tal:condition="not: results"> 
     
    96100           <div metal:use-macro="here/batch_macros/macros/navigation" /> 
    97101       </span> 
    98  
    99     <h3 tal:content="topic_name" tal:condition="python: not topic_name in ('draft','recent','portfolio')"/> 
    100102 
    101103       <tal:other_results metal:use-macro="here/lemill_browse_macros/macros/show_other_results"/> 
Note: See TracChangeset for help on using the changeset viewer.