Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of dev.sourcefabric.org:airtime

Browse source
This commit is contained in:
martin 2011-03-24 15:17:29 -04:00
commit f4bba3d302
5 changed files with 32 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
application/configs/navigation.php
View file

@ -16,7 +16,7 @@ $pages = array(
'resource' => 'nowplaying' 'resource' => 'nowplaying'
), ),
array( array(
'label' => 'Add Audio', 'label' => 'Add Media',
'module' => 'default', 'module' => 'default',
'controller' => 'Plupload', 'controller' => 'Plupload',
'action' => 'plupload', 'action' => 'plupload',

2
application/controllers/ScheduleController.php
View file

@ -161,7 +161,7 @@ class ScheduleController extends Zend_Controller_Action
if (($user->isHost($show->getShowId()) || $user->isAdmin()) && !$show->isRecorded() && !$show->isRebroadcast()) { if (($user->isHost($show->getShowId()) || $user->isAdmin()) && !$show->isRecorded() && !$show->isRebroadcast()) {
$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/schedule-show-dialog'.$params, $menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/schedule-show-dialog'.$params,
'callback' => 'window["buildScheduleDialog"]'), 'title' => 'Add Content'); 'callback' => 'window["buildScheduleDialog"]'), 'title' => 'Add / Remove Content');
$menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/clear-show'.$params, $menu[] = array('action' => array('type' => 'ajax', 'url' => '/Schedule/clear-show'.$params,
'callback' => 'window["scheduleRefetchEvents"]'), 'title' => 'Remove All Content'); 'callback' => 'window["scheduleRefetchEvents"]'), 'title' => 'Remove All Content');

19
install/DoctrineMigrations/Version20110312121200.php Normal file
View file

@ -0,0 +1,19 @@
<?php
namespace DoctrineMigrations;
use Doctrine\DBAL\Migrations\AbstractMigration,
Doctrine\DBAL\Schema\Schema;
class Version20110312121200 extends AbstractMigration
{
public function up(Schema $schema)
{
$schema->dropTable("cc_backup");
$schema->dropTable("cc_trans");
}
public function down(Schema $schema)
{
}
}

2
install/airtime-uninstall.php
View file

@ -39,7 +39,7 @@ $command = "sudo -u postgres dropdb {$CC_CONFIG['dsn']['database']} 2> /dev/null
//------------------------------------------------------------------------ //------------------------------------------------------------------------
if ($dbDeleteFailed) { if ($dbDeleteFailed) {
echo " * Couldn't delete the database, so deleting all the DB tables...".PHP_EOL; echo " * Couldn't delete the database, so deleting all the DB tables...".PHP_EOL;
AirtimeInstall::DbConnect(true); AirtimeInstall::DbConnect(false);
if (!PEAR::isError($CC_DBC)) { if (!PEAR::isError($CC_DBC)) {
$sql = "select * from pg_tables where tableowner = 'airtime'"; $sql = "select * from pg_tables where tableowner = 'airtime'";

4
install/installInit.php
View file

@ -214,8 +214,8 @@ class AirtimeInstall {
} }
public static function RemoveSymlinks(){ public static function RemoveSymlinks(){
exec("rm /usr/bin/airtime-import >/dev/null 2>&1"); exec("rm -f /usr/bin/airtime-import");
exec("rm /usr/bin/airtime-clean-storage >/dev/null 2>&1"); exec("rm -f /usr/bin/airtime-clean-storage");
} }