Changeset 22762

Show
Ignore:
Timestamp:
07/02/09 11:12:55 (1 year ago)
Author:
xfade
Message:

Add list view for QA queue.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/ragnaroek/midcom/org.maemo.packages/handler/packageinstance/packageinstance.php

    r22687 r22762  
    111111    public function _update_breadcrumb($handler_id) 
    112112    { 
     113        $prefix = $_MIDCOM->get_context_data(MIDCOM_CONTEXT_ANCHORPREFIX); 
    113114        $tmp = array(); 
    114115        if (!$this->_package_instance) 
    …… 
    116117            return; 
    117118        } 
     119 
     120        $tmp[] = Array 
     121        ( 
     122            MIDCOM_NAV_URL => $prefix . "view/" . $this->_package->name . '/', 
     123            MIDCOM_NAV_NAME => $this->_package->name, 
     124        ); 
    118125 
    119126        $tmp[] = Array 
    120127        ( 
    121128            MIDCOM_NAV_URL => "/", 
    122             MIDCOM_NAV_NAME => $this->_package->name, 
     129            MIDCOM_NAV_NAME => $this->_package_instance->version . ' ('. $this->_repository->title . ')', 
    123130        ); 
    124131 

  • branches/ragnaroek/midcom/org.maemo.packages/handler/repository/list.php

    r22600 r22762  
    6363        $qb->add_constraint('repository', '=', $repository[0]->id); 
    6464         
    65         $qb->add_order('package.name', 'ASC'); 
     65        if ($handler_id == 'repository_package_list') 
     66        { 
     67            $qb->add_order('package.name', 'ASC'); 
     68        } 
     69        else if ($handler_id == 'repository_package_qa_list') 
     70        { 
     71            $qb->add_constraint('status', 'NOT IN', array(ORG_MAEMO_PACKAGES_PACKAGE_STATUS_PROMOTED,ORG_MAEMO_PACKAGES_PACKAGE_STATUS_PROMOTION_ACCEPTED,ORG_MAEMO_PACKAGES_PACKAGE_STATUS_PROMOTION_REJECTED)); 
     72            $qb->add_constraint('package.section', 'LIKE', 'user/%'); 
     73            $qb->add_order('metadata.revised', 'ASC'); 
     74        } 
     75        else if ($handler_id == 'repository_package_qa_all_list') 
     76        { 
     77            $qb->add_constraint('status', 'NOT IN', array(ORG_MAEMO_PACKAGES_PACKAGE_STATUS_PROMOTED,ORG_MAEMO_PACKAGES_PACKAGE_STATUS_PROMOTION_ACCEPTED,ORG_MAEMO_PACKAGES_PACKAGE_STATUS_PROMOTION_REJECTED)); 
     78            $qb->add_order('metadata.revised', 'ASC'); 
     79        } 
    6680 
    6781        return $qb; 
    …… 
    92106        $this->_prepare_request_data(); 
    93107         
     108        $this->_request_data['handler_id'] = $handler_id; 
     109 
    94110        $_MIDCOM->set_pagetitle("{$this->_topic->extra}: repository list");    
    95111 
    …… 
    136152            } 
    137153            $this->_request_data['view_package'] = $data['datamanager_package']->get_content_html(); 
     154            $this->_request_data['package_instance'] = $package_instance; 
    138155 
    139156            midcom_show_style('repository_package_list_item'); 

  • branches/ragnaroek/midcom/org.maemo.packages/style/package_view.php

    r22749 r22762  
    140140            if (!isset($cache[$event->packageinstance]['name'])) 
    141141            { 
    142                 echo "here"; 
    143142                $qb = org_maemo_packages_packageinstance_dba::new_query_builder(); 
    144143                $qb->add_constraint('id', '=', $event->packageinstance); 

  • branches/ragnaroek/midcom/org.maemo.packages/style/repository_package_list_item.php

    r22600 r22762  
    55$package_instance = $data['view_package_instance']; 
    66 
    7 //     echo "<tr><td>".$repository["title"]."</td><td><a href=\"" . $prefix . "package_instance/view/" . $repository["name"] . "/" . $package["name"] . "/" . $package_instance["version"] . "\">" . $package["name"] . " " .$package_instance["version"] ."</a></td></tr>"; 
     7$qb = net_nemein_favourites_favourite_dba::new_query_builder(); 
     8$qb->add_constraint('objectGuid', '=', $data['package_instance']->guid); 
     9$qb->add_constraint('bury', '=', false); 
     10$karma = $qb->count_unchecked(); 
    811?> 
    912 
    1013<div class="repository_list_item"> 
    1114    <div class="title"><a title="Basic information about <?php echo $package["name"]; ?>" href="<?php echo $prefix . "view/" . $package["name"]; ?>/"><?php echo $package["title"]; ?></a></div> 
    12 <div class="version"><a title="Details for version <?php echo $package_instance["version"] ." of ".$package["name"]; ?>" href="<?php echo $prefix . "package_instance/view/" . $repository["name"]."/".$package["name"]."/".$package_instance["version"]; ?>/"><?php echo $package_instance["version"]; ?></a></div> 
     15    <div class="version"><a title="Details for version <?php echo $package_instance["version"] ." of ".$package["name"]; ?>" href="<?php echo $prefix . "package_instance/view/" . $repository["name"]."/".$package["name"]."/".$package_instance["version"]; ?>/"><?php echo $package_instance["version"]; ?></a></div> 
     16    <div class="karma">Karma: <?php echo $karma; ?></div> 
     17<?php 
     18    if (   $data['handler_id'] == 'repository_package_qa_list' 
     19        || $data['handler_id'] == 'repository_package_qa_all_list' 
     20       ) 
     21    { 
     22        $qb = org_maemo_packages_package_packageevent_dba::new_query_builder(); 
     23        $qb->add_constraint('packageinstance', '=', $data['package_instance']->id); 
     24        $qb->add_constraint('type', 'IN', array(ORG_MAEMO_PACKAGES_PACKAGE_STATUS_IMPORTED,ORG_MAEMO_PACKAGES_PACKAGE_STATUS_IN_TESTING)); 
     25        $qb->add_order('metadata.published', 'DESC'); 
     26        $qb->set_limit(1); 
     27        $package_event = $qb->execute_unchecked(); 
     28        if ($package_event) 
     29        { 
     30 
     31?> 
     32    <div class="waiting_since"><?php echo gmdate('Y-m-d H:i e',$package_event[0]->metadata->published); ?></div> 
     33<?php 
     34        } 
     35    } 
     36?> 
    1337</div> 

  • branches/ragnaroek/midcom/org.maemo.packages/viewer.php

    r22733 r22762  
    156156            'handler' => array('org_maemo_packages_handler_packageinstance_repoview', 'repoview'), 
    157157            'fixed_args' => array('repoview'), 
     158            'variable_args' => 1, 
     159        ); 
     160 
     161        // Handle /repository/qa/<repositoryname>/ 
     162        $this->_request_switch['repository_package_qa_list'] = array 
     163        ( 
     164            'handler' => array('org_maemo_packages_handler_repository_list', 'list'), 
     165            'fixed_args' => array('repository','qa'), 
     166            'variable_args' => 1, 
     167        ); 
     168 
     169        // Handle /repository/qa/all/<repositoryname>/ 
     170        $this->_request_switch['repository_package_qa_all_list'] = array 
     171        ( 
     172            'handler' => array('org_maemo_packages_handler_repository_list', 'list'), 
     173            'fixed_args' => array('repository','qa','all'), 
    158174            'variable_args' => 1, 
    159175        );