starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

web: display the api token in the sensor table

This commit is contained in:
Bart Van Der Meerssche 2010-03-15 20:20:41 +00:00
parent 155f2bfef9
commit 03eee97e37
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/drupal/modules/logger/logger.admin.inc
View File

@ -155,14 +155,16 @@ function _logger_account_sensors($type = 'electricity') {
global $user; global $user;
$rows = array(); $rows = array();
$result = db_query("SELECT lm.meter, lm.function $result = db_query("SELECT lm.meter, lm.function, lt.token, lt.permissions
FROM {logger_meters} lm FROM {logger_meters} lm
INNER JOIN {logger_tokens} lt ON lm.meter = lt.meter
WHERE lm.uid = %d AND lm.type = '%s' WHERE lm.uid = %d AND lm.type = '%s'
ORDER BY lm.function", $user->uid, $type); ORDER BY lm.function", $user->uid, $type);
while ($sensor = db_fetch_object($result)) { while ($sensor = db_fetch_object($result)) {
$row = array(); $row = array();
$row[] = $sensor->meter; $row[] = $sensor->meter;
$row[] = $sensor->token;
$row[] = $type; $row[] = $type;
$row[] = $sensor->function; $row[] = $sensor->function;
@ -180,7 +182,7 @@ function _logger_account_sensors($type = 'electricity') {
*/ */
function theme_logger_account_sensors_list($items) { function theme_logger_account_sensors_list($items) {
if (count($items) > 0) { if (count($items) > 0) {
$headers = array(t('Sensor'), t('Type'), t('Function')); $headers = array(t('Sensor'), t('Token'), t('Type'), t('Function'));
$output = theme('table', $headers, $items); $output = theme('table', $headers, $items);
} }
else { else {