Skip to content
This repository has been archived by the owner on Sep 10, 2021. It is now read-only.

Commit

Permalink
BUG: Minor fixes to tracker dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Snape committed May 23, 2014
1 parent e05afd9 commit 9adeca0
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 24 deletions.
18 changes: 9 additions & 9 deletions modules/tracker/configs/module.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[global]
; version of the module
version = 1.0.0
; full name
fullname= Tracker Dashboard
; description
description= Track scalar results over time
;Category
category= Visualization
;Dependencies
dependencies= api,scheduler
version = 1.1.0
; full name of the module (displayed on admin page)
fullname = Tracker Dashboard
; description (displayed on admin page)
description = "Tracks scalar results over time"
; category
category = Visualization
; dependencies (comma separated list of other module dependencies)
dependencies = api,scheduler
4 changes: 2 additions & 2 deletions modules/tracker/database/mysql/1.0.0.sql
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `tracker_trend` (
CREATE TABLE IF NOT EXISTS `tracker_scalar` (
`scalar_id` bigint(20) NOT NULL AUTO_INCREMENT,
`trend_id` bigint(20) NOT NULL,
`value` double precision,
`value` double,
`producer_revision` varchar(255),
`submit_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (`scalar_id`),
Expand All @@ -43,7 +43,7 @@ CREATE TABLE IF NOT EXISTS `tracker_scalar2item` (
CREATE TABLE IF NOT EXISTS `tracker_threshold_notification` (
`threshold_id` bigint(20) NOT NULL AUTO_INCREMENT,
`trend_id` bigint(20) NOT NULL,
`value` double precision,
`value` double,
`comparison` varchar(2),
`action` varchar(80) NOT NULL,
`recipient_id` bigint(20) NOT NULL,
Expand Down
6 changes: 2 additions & 4 deletions modules/tracker/database/upgrade/1.0.1.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* 1. Adds a user_id value to a scalar record indicating which user uploaded the scalar
* 2. Adds a binary "official" flag to a scalar record indicating if it is an official or experimental submission
* 3. Adds submit_time and user_id indices to the tracker_scalar table
* 3. Adds a user_id index to the tracker_scalar table
*/
class Tracker_Upgrade_1_0_1 extends MIDASUpgrade
{
Expand All @@ -16,16 +16,14 @@ public function mysql()
$this->db->query("ALTER TABLE `tracker_scalar` ADD COLUMN `user_id` bigint(20) NOT NULL DEFAULT -1");
$this->db->query("ALTER TABLE `tracker_scalar` ADD COLUMN `official` tinyint(4) NOT NULL DEFAULT 1");

$this->db->query("ALTER TABLE `tracker_scalar` ADD INDEX (`submit_time`)");
$this->db->query("ALTER TABLE `tracker_scalar` ADD INDEX (`user_id`)");
$this->db->query("ALTER TABLE `tracker_scalar` ADD KEY (`user_id`)");
}

public function pgsql()
{
$this->db->query("ALTER TABLE tracker_scalar ADD COLUMN user_id bigint NOT NULL DEFAULT -1");
$this->db->query("ALTER TABLE tracker_scalar ADD COLUMN official smallint NOT NULL DEFAULT 1");

$this->db->query("CREATE INDEX tracker_scalar_idx_submit_time ON tracker_scalar (submit_time)");
$this->db->query("CREATE INDEX tracker_scalar_idx_user_id ON tracker_scalar (user_id)");
}

Expand Down
2 changes: 1 addition & 1 deletion modules/tracker/public/css/producer/producer.edit.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ div.submitButtonContainer {

textarea.description {
resize: none;
}
}
8 changes: 0 additions & 8 deletions modules/tracker/views/config/index.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,6 @@ $this->headScript()->appendFile($this->moduleWebroot.'/public/js/config/config.i
?>

<div class="viewMain">
<div class="explanation">
<p>Optionally set the Repository Browser URL to point to your repository browser. If set, users will be able
to click revision links for uploaded scalar values and go to the corresponding repository browser page for
that revision. In the field below, use the special placeholder string <b>%revision</b> where the revision
should go in the URL.</p>
<p><b>Example:</b> https://github.com/myuser/myproject/commit/%revision</p>
<p>Leave this field blank if you do not want the revision numbers to link to anything.</p>
</div>
<form id="configForm" class="genericForm" method="POST" action="<?php echo $this->webroot;?>/tracker/config/submit">
<div class="explanation">
<p>Set this field to the number of hours that unofficial submissions should be kept before being deleted automatically
Expand Down

0 comments on commit 9adeca0

Please sign in to comment.