Changeset 3519

Show
Ignore:
Timestamp:
04/16/08 05:02:55 (5 months ago)
Author:
Blackhex
Message:
  • Fixed bug in column sorting direction.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • discussionplugin/0.10/tracdiscussion/api.py

    r3518 r3519  
    333333                # Get form values 
    334334                order = req.args.get('order') or 'id' 
    335                 desc = req.args.get('desc') 
     335                direction = req.args.get('direction') or 'asc' 
    336336 
    337337                # Display groups. 
    338338                req.hdf['discussion.order'] = order 
    339                 req.hdf['discussion.desc'] = desc 
     339                req.hdf['discussion.direction'] = direction 
    340340                if group: 
    341341                    req.hdf['discussion.name'] = group['name'] 
    342342                    req.hdf['discussion.description'] = \ 
    343343                      group['description'] 
    344                 req.hdf['discussion.groups'] = self.get_groups(req, cursor, order, desc) 
     344                req.hdf['discussion.groups'] = self.get_groups(req, cursor, order, 
     345                  direction == 'desc') 
    345346 
    346347            elif mode == 'group-add': 
    …… 
    404405                # Get form values 
    405406                order = req.args.get('order') or self.forum_sort 
    406                 desc = req.args.get('desc') or self.forum_sort_direction 
     407                direction = req.args.get('direction') or self.forum_sort_direction 
    407408 
    408409                # Display forums. 
    409410                req.hdf['discussion.order'] = order 
    410                 req.hdf['discussion.desc'] = desc 
     411                req.hdf['discussion.direction'] = direction 
    411412                req.hdf['discussion.groups'] = self.get_groups(req, cursor) 
    412413                req.hdf['discussion.forums'] = self.get_forums(req, cursor, 
    413                   order, desc) 
     414                  order, direction == 'desc') 
    414415 
    415416            elif mode == 'admin-forum-list': 
    …… 
    418419                # Get form values 
    419420                order = req.args.get('order') or self.forum_sort 
    420                 desc = req.args.get('desc') or self.forum_sort_direction 
     421                direction = req.args.get('direction') or self.forum_sort_direction 
    421422 
    422423                # Display forums. 
    423424                req.hdf['discussion.order'] = order 
    424                 req.hdf['discussion.desc'] = desc 
     425                req.hdf['discussion.direction'] = direction 
    425426                if forum: 
    426427                    req.hdf['discussion.name'] = forum['name'] 
    …… 
    433434                req.hdf['discussion.groups'] = self.get_groups(req, cursor) 
    434435                req.hdf['discussion.forums'] = self.get_forums(req, cursor, 
    435                   order, desc) 
     436                  order, direction == 'desc') 
    436437 
    437438            elif mode == 'forum-add': 
    …… 
    524525                # Get form values 
    525526                order = req.args.get('order') or self.topic_sort 
    526                 desc = req.args.get('desc') or self.topic_sort_direction 
     527                direction = req.args.get('direction') or self.topic_sort_direction 
    527528 
    528529                # Display topics. 
    529530                req.hdf['discussion.order'] = order 
    530                 req.hdf['discussion.desc'] = desc 
     531                req.hdf['discussion.direction'] = direction 
    531532                req.hdf['discussion.topics'] = self.get_topics(req, cursor, 
    532                   forum['id'], order, desc) 
     533                  forum['id'], order, direction == 'desc') 
    533534 
    534535            elif mode == 'topic-add': 

  • discussionplugin/0.10/tracdiscussion/templates/admin-forum-list.cs

    r2597 r3519  
    123123        <tr> 
    124124          <th class="sel">&nbsp;</th> 
    125           <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'id', 'ID', discussion.href + '/forum' + '?') ?> 
    126           <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'name', 'Name', discussion.href + '/forum' + '?') ?> 
    127           <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'subject', 'Subject', discussion.href + '/forum' + '?') ?> 
    128           <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'description', 'Description', discussion.href + '/forum' + '?') ?> 
    129           <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'moderators', 'Moderators', discussion.href + '/forum' + '?') ?> 
     125          <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'id', 'ID', discussion.href + '/forum' + '?') ?> 
     126          <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'name', 'Name', discussion.href + '/forum' + '?') ?> 
     127          <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'subject', 'Subject', discussion.href + '/forum' + '?') ?> 
     128          <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'description', 'Description', discussion.href + '/forum' + '?') ?> 
     129          <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'moderators', 'Moderators', discussion.href + '/forum' + '?') ?> 
    130130          <?cs if:discussion.groups.1.id ?> 
    131             <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'forum_group', 'Group', discussion.href + '/forum' + '?') ?> 
     131            <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'forum_group', 'Group', discussion.href + '/forum' + '?') ?> 
    132132          <?cs /if ?> 
    133133        </tr> 

  • discussionplugin/0.10/tracdiscussion/templates/admin-group-list.cs

    r2597 r3519  
    5353        <tr> 
    5454          <th class="sel">&nbsp;</th> 
    55           <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'id', 'ID', discussion.href + '/group' + '?') ?> 
    56           <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'name', 'Name', discussion.href + '/group' + '?') ?> 
    57           <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'description', 'Description', discussion.href + '/group' + '?') ?> 
     55          <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'id', 'ID', discussion.href + '/group' + '?') ?> 
     56          <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'name', 'Name', discussion.href + '/group' + '?') ?> 
     57          <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'description', 'Description', discussion.href + '/group' + '?') ?> 
    5858        </tr> 
    5959      </thead> 

  • discussionplugin/0.10/tracdiscussion/templates/discussion-macros.cs

    r2597 r3519  
    1 <?cs def:discussion_sortable_th(order, desc, class, title, href) ?> 
    2   <th class="<?cs var:class ?><?cs if:order == class ?> <?cs if:desc ?>desc<?cs else ?>asc<?cs /if ?><?cs /if ?>"> 
    3     <a title="Sort by <?cs var:class ?><?cs if:order == class && !desc ?> (descending)<?cs /if ?>" href="<?cs var:href ?>&amp;order=<?cs var:class ?><?cs if:order == class && !desc ?>&amp;desc=1<?cs /if ?>"> 
     1<?cs def:discussion_sortable_th(order, direction, class, title, href) ?> 
     2  <th class="<?cs var:class ?><?cs if:order == class ?> <?cs if:direction == 'desc' ?>desc<?cs else ?>asc<?cs /if ?><?cs /if ?>"> 
     3    <a title="Sort by <?cs var:class ?><?cs if:order == class && direction == 'asc' ?> (descending)<?cs /if ?>" href="<?cs var:href ?>&amp;order=<?cs var:class ?><?cs if:order == class && direction ?>&amp;direction=<?cs if:direction == 'desc' ?>asc<?cs else ?>desc<?cs /if?><?cs /if ?>"> 
    44      <?cs var:title ?> 
    55    </a> 

  • discussionplugin/0.10/tracdiscussion/templates/forum-list.cs

    r2597 r3519  
    1414      <?cs /if ?> 
    1515      <tr> 
    16         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'id', 'ID', discussion.href + '?') ?> 
    17         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'subject', 'Forum', discussion.href + '?') ?> 
    18         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'moderators', 'Moderators', discussion.href + '?') ?> 
    19         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'lasttopic', 'Last Topic', discussion.href + '?') ?> 
    20         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'lastreply', 'Last Reply', discussion.href + '?') ?> 
    21         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'time', 'Founded', discussion.href + '?') ?> 
    22         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'topics', 'Topics', discussion.href + '?') ?> 
    23         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'replies', 'Replies', discussion.href + '?') ?> 
     16        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'id', 'ID', discussion.href + '?') ?> 
     17        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'subject', 'Forum', discussion.href + '?') ?> 
     18        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'moderators', 'Moderators', discussion.href + '?') ?> 
     19        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'lasttopic', 'Last Topic', discussion.href + '?') ?> 
     20        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'lastreply', 'Last Reply', discussion.href + '?') ?> 
     21        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'time', 'Founded', discussion.href + '?') ?> 
     22        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'topics', 'Topics', discussion.href + '?') ?> 
     23        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'replies', 'Replies', discussion.href + '?') ?> 
    2424      </tr> 
    2525    </thead> 

  • discussionplugin/0.10/tracdiscussion/templates/topic-list.cs

    r2597 r3519  
    1111    <thead> 
    1212      <tr> 
    13         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'id', 'ID', discussion.href + '/' + discussion.forum.id + '?') ?> 
    14         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'subject', 'Subject', discussion.href + '/' + discussion.forum.id + '?') ?> 
    15         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'author', 'Author', discussion.href + '/' + discussion.forum.id + '?') ?> 
    16         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'lastreply', 'Last Reply', discussion.href + '/' + discussion.forum.id + '?') ?> 
    17         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'time', 'Founded', discussion.href + '/' + discussion.forum.id + '?') ?> 
    18         <?cs call:discussion_sortable_th(discussion.order, discussion.desc, 'replies', 'Replies', discussion.href + '/' + discussion.forum.id + '?') ?> 
     13        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'id', 'ID', discussion.href + '/' + discussion.forum.id + '?') ?> 
     14        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'subject', 'Subject', discussion.href + '/' + discussion.forum.id + '?') ?> 
     15        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'author', 'Author', discussion.href + '/' + discussion.forum.id + '?') ?> 
     16        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'lastreply', 'Last Reply', discussion.href + '/' + discussion.forum.id + '?') ?> 
     17        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'time', 'Founded', discussion.href + '/' + discussion.forum.id + '?') ?> 
     18        <?cs call:discussion_sortable_th(discussion.order, discussion.direction, 'replies', 'Replies', discussion.href + '/' + discussion.forum.id + '?') ?> 
    1919      </tr> 
    2020    </thead> 

  • discussionplugin/0.11/tracdiscussion/api.py

    r3518 r3519  
    333333                # Get form values. 
    334334                order = context.req.args.get('order') or 'id' 
    335                 desc = context.req.args.get('desc') 
     335                direction = context.req.args.get('direction') or 'asc' 
    336336 
    337337                # Prepare values for edit form. 
    …… 
    342342                # Display groups. 
    343343                self.data['order'] = order 
    344                 self.data['desc'] = desc 
    345                 self.data['groups'] = self.get_groups(context, order, desc) 
     344                self.data['direction'] = direction 
     345                self.data['groups'] = self.get_groups(context, order, 
     346                  direction == 'desc') 
    346347 
    347348            elif mode == 'group-add': 
    …… 
    402403                # Get form values. 
    403404                order = context.req.args.get('order') or self.forum_sort 
    404                 desc = context.req.args.get('desc') or self.forum_sort_direction 
     405                direction = context.req.args.get('direction') or \ 
     406                  self.forum_sort_direction 
     407 
     408 
     409                self.log.debug('direction: %s' % (direction,)) 
     410 
    405411 
    406412                # Display forums. 
    407413                self.data['order'] = order 
    408                 self.data['desc'] = desc 
     414                self.data['direction'] = direction 
    409415                self.data['groups'] = self.get_groups(context) 
    410                 self.data['forums'] = self.get_forums(context, order, desc) 
     416                self.data['forums'] = self.get_forums(context, order, 
     417                  direction == 'desc') 
    411418                self.data['forum'] = None 
    412419 
    …… 
    415422 
    416423                # Get ordering arguments values. 
    417                 order = context.req.args.get('order') or 'id' 
    418                 desc = context.req.args.get('desc') 
     424                order = context.req.args.get('order') or self.forum_sort 
     425                direction = context.req.args.get('direction') or \ 
     426                  self.forum_sort_direction 
    419427 
    420428                # Prepare values for edit form. 
    …… 
    428436                # Display forums. 
    429437                self.data['order'] = order 
    430                 self.data['desc'] = desc 
     438                self.data['direction'] = direction 
    431439                self.data['users'] = self.get_users(context) 
    432440                self.data['groups'] = self.get_groups(context) 
    433                 self.data['forums'] = self.get_forums(context, order, desc) 
     441                self.data['forums'] = self.get_forums(context, order, 
     442                  direction == 'desc') 
    434443 
    435444            elif mode == 'forum-add': 
    …… 
    521530                # Get form values 
    522531                order = context.req.args.get('order') or self.topic_sort 
    523                 desc = context.req.args.get('desc') or self.topic_sort_direction 
     532                direction = context.req.args.get('direction') or \ 
     533                  self.topic_sort_direction 
    524534 
    525535                # Display topics. 
    526536                self.data['order'] = order 
    527                 self.data['desc'] = desc 
     537                self.data['direction'] = direction 
    528538                self.data['topics'] = self.get_topics(context, forum['id'], 
    529                   order, desc) 
     539                  order, direction == 'desc') 
    530540 
    531541            elif mode == 'topic-add': 

  • discussionplugin/0.11/tracdiscussion/templates/admin-forum-list.html

    r2365 r3519  
    7777              <tr> 
    7878                <th class="sel">&nbsp;</th> 
    79                 ${sortable_th(discussion.order, discussion.desc, 'id', 'ID', panel_href())} 
    80                 ${sortable_th(discussion.order, discussion.desc, 'name', 'Name', panel_href())} 
    81                 ${sortable_th(discussion.order, discussion.desc, 'subject', 'Subject', panel_href())} 
    82                 ${sortable_th(discussion.order, discussion.desc, 'description', 'Description', panel_href())} 
    83                 ${sortable_th(discussion.order, discussion.desc, 'moderators', 'Moderators', panel_href())} 
     79                ${sortable_th(discussion.order, discussion.direction, 'id', 'ID', panel_href())} 
     80                ${sortable_th(discussion.order, discussion.direction, 'name', 'Name', panel_href())} 
     81                ${sortable_th(discussion.order, discussion.direction, 'subject', 'Subject', panel_href())} 
     82                ${sortable_th(discussion.order, discussion.direction, 'description', 'Description', panel_href())} 
     83                ${sortable_th(discussion.order, discussion.direction, 'moderators', 'Moderators', panel_href())} 
    8484                <py:if test="len(discussion.groups) > 1"> 
    85                   ${sortable_th(discussion.order, discussion.desc, 'forum_group', 'Group', panel_href())} 
     85                  ${sortable_th(discussion.order, discussion.direction, 'forum_group', 'Group', panel_href())} 
    8686                </py:if> 
    8787              </tr> 

  • discussionplugin/0.11/tracdiscussion/templates/admin-group-list.html

    r2365 r3519  
    4242              <tr> 
    4343                <th class="sel">&nbsp;</th> 
    44                 ${sortable_th(discussion.order, discussion.desc, 'id', 'ID', panel_href())} 
    45                 ${sortable_th(discussion.order, discussion.desc, 'name', 'Name', panel_href())} 
    46                 ${sortable_th(discussion.order, discussion.desc, 'description', 'Description', panel_href())} 
     44                ${sortable_th(discussion.order, discussion.direction, 'id', 'ID', panel_href())} 
     45                ${sortable_th(discussion.order, discussion.direction, 'name', 'Name', panel_href())} 
     46                ${sortable_th(discussion.order, discussion.direction, 'description', 'Description', panel_href())} 
    4747              </tr> 
    4848            </thead> 

  • discussionplugin/0.11/tracdiscussion/templates/discussion-macros.html

    r2917 r3519  
    11<html xmlns:py="http://genshi.edgewall.org/" py:strip=""> 
    22 
    3   <py:def function="sortable_th(order, desc, Class, title, href)"> 
    4     <th class="${Class}${order == Class and (desc and ' desc' or ' asc') or ''}"> 
    5       <a title="Sort by ${Class}${order == Class and not desc and ' (descending)' or ''}" href="${href}?order=${Class}&amp;desc=${(Class == order and not desc and 1 or None)}"> 
     3  <py:def function="sortable_th(order, direction, Class, title, href)"> 
     4    <th class="${Class} ${order == Class and direction or ''}"> 
     5      <a title="Sort by ${Class}${order == Class and direction == 'asc' and ' (descending)' or ''}" href="${href}?order=${Class}&amp;direction=${(Class == order and direction == 'desc' and 'asc' or 'desc')}"> 
    66        $title 
    77      </a> 

  • discussionplugin/0.11/tracdiscussion/templates/forum-list.html

    r2917 r3519  
    1717        </tr> 
    1818        <tr> 
    19           ${sortable_th(discussion.order, discussion.desc, 'id', 'ID', href.discussion())} 
    20           ${sortable_th(discussion.order, discussion.desc, 'subject', 'Forum', href.discussion())} 
    21           ${sortable_th(discussion.order, discussion.desc, 'moderators', 'Moderators', href.discussion())} 
    22           ${sortable_th(discussion.order, discussion.desc, 'lasttopic', 'Last Topic', href.discussion())} 
    23           ${sortable_th(discussion.order, discussion.desc, 'lastreply', 'Last Reply', href.discussion())} 
    24           ${sortable_th(discussion.order, discussion.desc, 'time', 'Founded', href.discussion())} 
    25           ${sortable_th(discussion.order, discussion.desc, 'topics', 'Topics', href.discussion())} 
     19          ${sortable_th(discussion.order, discussion.direction, 'id', 'ID', href.discussion())} 
     20          ${sortable_th(discussion.order, discussion.direction, 'subject', 'Forum', href.discussion())} 
     21          ${sortable_th(discussion.order, discussion.direction, 'moderators', 'Moderators', href.discussion())} 
     22          ${sortable_th(discussion.order, discussion.direction, 'lasttopic', 'Last Topic', href.discussion())} 
     23          ${sortable_th(discussion.order, discussion.direction, 'lastreply', 'Last Reply', href.discussion())} 
     24          ${sortable_th(discussion.order, discussion.direction, 'time', 'Founded', href.discussion())} 
     25          ${sortable_th(discussion.order, discussion.direction, 'topics', 'Topics', href.discussion())} 
    2626          <th>New Topics</th> 
    27           ${sortable_th(discussion.order, discussion.desc, 'replies', 'Replies', href.discussion())} 
     27          ${sortable_th(discussion.order, discussion.direction, 'replies', 'Replies', href.discussion())} 
    2828          <th>New Replies</th> 
    2929        </tr> 

  • discussionplugin/0.11/tracdiscussion/templates/topic-list.html

    r2917 r3519  
    2121            <thead> 
    2222              <tr> 
    23                 ${sortable_th(discussion.order, discussion.desc, 'id', 'ID', href.discussion(discussion.forum.id))} 
    24                 ${sortable_th(discussion.order, discussion.desc, 'subject', 'Subject', href.discussion(discussion.forum.id))} 
    25                 ${sortable_th(discussion.order, discussion.desc, 'author', 'Author', href.discussion(discussion.forum.id))} 
    26                 ${sortable_th(discussion.order, discussion.desc, 'lastreply', 'Last Reply', href.discussion(discussion.forum.id))} 
    27                 ${sortable_th(discussion.order, discussion.desc, 'time', 'Founded', href.discussion(discussion.forum.id))} 
    28                 ${sortable_th(discussion.order, discussion.desc, 'replies', 'Replies', href.discussion(discussion.forum.id))} 
     23                ${sortable_th(discussion.order, discussion.direction, 'id', 'ID', href.discussion(discussion.forum.id))} 
     24                ${sortable_th(discussion.order, discussion.direction, 'subject', 'Subject', href.discussion(discussion.forum.id))} 
     25                ${sortable_th(discussion.order, discussion.direction, 'author', 'Author', href.discussion(discussion.forum.id))} 
     26                ${sortable_th(discussion.order, discussion.direction, 'lastreply', 'Last Reply', href.discussion(discussion.forum.id))} 
     27                ${sortable_th(discussion.order, discussion.direction, 'time', 'Founded', href.discussion(discussion.forum.id))} 
     28                ${sortable_th(discussion.order, discussion.direction, 'replies', 'Replies', href.discussion(discussion.forum.id))} 
    2929                <th class="new_replies">New Replies</th> 
    3030              </tr>