diff options
-rwxr-xr-x | rh-bin/musicgrid.cgi | 6 | ||||
-rw-r--r-- | www/js/musicpools.js | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rh-bin/musicgrid.cgi b/rh-bin/musicgrid.cgi index 440f95b..908dd24 100755 --- a/rh-bin/musicgrid.cgi +++ b/rh-bin/musicgrid.cgi @@ -56,7 +56,7 @@ sub set_clock return 400, "mandatory field NAME is missing"; } - my ($result, $status, $error) = RHRD::rddb::set_musicpools_clock($ctx, $dow, $hour, $shortname); + my ($result, $status, $error) = RHRD::rddb::set_musicgrid_clock($ctx, $dow, $hour, $shortname); if(!defined $result) { return 500, $status . ": " . $error; } @@ -75,10 +75,10 @@ if(!defined $username) { (my $ctx, $status, $errorstring) = RHRD::rddb::init(); if(defined $ctx) { (my $authenticated, $status, $errorstring) = RHRD::rddb::check_token($ctx, $username, $token); - my $authorized = RHRD::rddb::is_musicpools_user($ctx, $username); + my $authorized = RHRD::rddb::is_musicgrid_user($ctx, $username); if($authenticated == 1 && $authorized == 1) { if($cmd eq "GET") { - @clocks = RHRD::rddb::get_musicpools_clocks($ctx); + @clocks = RHRD::rddb::get_musicgrid_clocks($ctx); if(!defined $clocks[0] && defined $clocks[1]) { ($responsecode, $errorstring) = (500, $clocks[1] . ": " . $clocks[2]); } else { diff --git a/www/js/musicpools.js b/www/js/musicpools.js index c9083e8..383cf9e 100644 --- a/www/js/musicpools.js +++ b/www/js/musicpools.js @@ -108,7 +108,7 @@ Rdxport.MusicpoolsView.prototype.updateSelector = function() { if(atitle > btitle) return 1; return -1; }).each(function(index, musicpool) { - var name = '<strong>' + musicpool.title + '</strong> (' + musicpool.clock + ')'; + var name = musicpool.clock + ' | <strong>' + musicpool.title + '</strong>'; var link = $('<a>').attr('href', '#').html(name).click(function() { self.setCurrentPoolId(musicpool.clock); self.getCurrentPoolView().model.fetchCarts(); |