Changeset 12623

Show
Ignore:
Timestamp:
02/22/08 13:28:41 (11 months ago)
Author:
pottedmeat
Message:

Refs #5602. Change management is now limited to objects

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • util/branches/dev/jsdoc/jsdoc.module

    r12622 r12623  
    8383  } 
    8484  else { 
    85     if (db_result(db_query("SELECT 1 FROM {jsdoc_objects} WHERE used = 0 UNION SELECT 1 FROM {jsdoc_resources} WHERE used = 0"))) { 
     85    if (db_result(db_query("SELECT 1 FROM {jsdoc_objects} WHERE used = 0"))) { 
    8686      $items[] = array('path' => 'jsdoc/manage', 
    8787        'title' => t('Manage Documentation Changes'), 
     
    696696 
    697697function jsdoc_manage($edit = array()) { 
    698   // Resources 
    699   if ($resource = db_fetch_object(db_query("SELECT nid, vid, version FROM {jsdoc_resources} WHERE used = 0"))) { 
    700     $form['jsdoc_changes']['#tree'] = true; 
    701     $query = db_query("SELECT nid, vid FROM {jsdoc_resources} WHERE new = 1 AND version = %d", $resource->version); 
    702     $news = array( 
    703       '#type' => 'select', 
    704       '#title' => t('Renamed To'), 
    705       '#options' => array('0' => '') 
    706     ); 
    707     while($result = db_fetch_object($query)) { 
    708       $node = _jsdoc_node_load($result->nid, $result->vid); 
    709       $news['#options'][$node->nid . '_' . $node->vid] = $node->title; 
    710     } 
    711  
    712     $node = _jsdoc_node_load($resource->nid, $resource->vid); 
    713  
    714     $form['jsdoc_changes']['resources'][$node->nid][$node->vid] = array( 
    715       '#type' => 'fieldset', 
    716       '#title' => $node->title 
    717     ); 
    718     $form['jsdoc_changes']['resources'][$node->nid][$node->vid]['delete'] = array( 
    719       '#type' => 'checkbox', 
    720       '#title' => t('Deleted') 
    721     ); 
    722  
    723     if ($form['jsdoc_changes']['resources']) { 
    724       if (count($news['#options']) > 1) { 
    725             $form['jsdoc_changes']['resources'][$node->nid][$node->vid]['move'] = $news; 
    726       } 
    727       $form['jsdoc_changes']['resources']['#type'] = 'fieldset'; 
    728       $form['jsdoc_changes']['resources']['#title'] = t('Removed Resources'); 
    729       $form['jsdoc_changes']['resources']['#collapsible'] = true; 
    730       $form['jsdoc_changes']['resources']['#tree'] = true; 
    731     } 
    732   } 
    733  
    734698  // Objects 
    735699  if ($object = db_fetch_object(db_query("SELECT nid, vid, version FROM {jsdoc_objects} WHERE used = 0"))) {