Changeset ac2e836e63579149085781c535a674deafed581b

Show
Ignore:
Timestamp:
10/10/08 02:50:21 (6 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1223607021 +0000
git-parent:

[47a8b0ac0e07bcc15045d1ef0394981a9696314c]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1223607021 +0000
Message:

fixup derivatives

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • ui/web/htdocs/graph_panel.inc

    r47a8b0a rac2e836  
    105105  if(d.metric_type == 'text') { 
    106106    o.find('tr.mathbox').remove(); 
    107     o.find('input[@name="derive"]').attr('disabled','disabled'); 
     107    o.find('select[@name="derive"]').val('false'); 
    108108  } 
    109109  else { 
    110     if(d.derive){o.find('input[@name="derive"]').attr("checked","checked");} 
    111     o.find('input[@name="derive"]').change(function(){ 
    112       d.derive = ($(this).attr("checked")); 
     110    if(d.derive){ 
     111      o.find('select[@name="derive"]').val(d.derive); 
     112    } 
     113    o.find('select[@name="derive"]').change(function(){ 
     114      d.derive = $(this).find(":selected").val(); 
    113115      update_current_graph(true); 
    114116    }).change(); 
     
    298300                <td class="data datatitle"></td> 
    299301                <td></td> 
    300                 <td><input name="derive" type="checkbox" value="1"/></td> 
     302                <td><select name="derive"><option value="false">no</option><option value="derive">derive</option><option value="counter">counter</option></select></td> 
    301303                <td><span class="axis axisl"> L</span> <span class="axis axisr"> R</span></td> 
    302304                <td><a href="#" class="deletedatapoint"><span>delete</span></a></td> 
  • ui/web/htdocs/json_graph_flot.php

    r47a8b0a rac2e836  
    2828  if($d['metric_type'] == 'numeric') { 
    2929    $driver->addDataSet($d['sid'], $d['metric_name'], 
    30                         ($d['derive']=="true")?"counter":"false", 
    31                         $d['math2'], $settings); 
     30                        $d['derive'], $d['math2'], $settings); 
    3231  } 
    3332  else 
  • ui/web/htdocs/worksheet_panel.inc

    r47a8b0a rac2e836  
    152152<div class="error"><p class="error" id="gtool-error"></p></div> 
    153153 
    154 <div id="payload"> 
     154<div id="ws_payload"> 
    155155</div>