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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
denise 2012-09-19 10:49:52 -04:00
commit 281e7d1092
5 changed files with 66 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/controllers/UserController.php
View file

@ -13,10 +13,6 @@ class UserController extends Zend_Controller_Action
->initContext(); ->initContext();
} }
public function indexAction()
{
}
public function addUserAction() public function addUserAction()
{ {
global $CC_CONFIG; global $CC_CONFIG;
@ -140,6 +136,7 @@ class UserController extends Zend_Controller_Action
//$new_owner_id = $this->_getParam("new_owner"); //$new_owner_id = $this->_getParam("new_owner");
//$new_owner = new Application_Model_User($new_owner_id); //$new_owner = new Application_Model_User($new_owner_id);
$user->donateFilesTo( $new_owner ); $user->donateFilesTo( $new_owner );
Logging::info("Reassign to user {$new_owner->getDbId()}");
} }
# Finally delete the user # Finally delete the user
$this->view->entries = $user->delete(); $this->view->entries = $user->delete();

7
airtime_mvc/application/models/airtime/CcFiles.php
View file

@ -30,7 +30,8 @@ class CcFiles extends BaseCcFiles {
$dt = new DateTime($v); $dt = new DateTime($v);
} catch (Exception $x) { } catch (Exception $x) {
throw new PropelException('Error parsing date/time value: ' . var_export($v, true), $x); throw new PropelException('Error parsing date/time value: ' .
var_export($v, true), $x);
} }
} }
@ -40,8 +41,10 @@ class CcFiles extends BaseCcFiles {
return $this; return $this;
} }
public function reassignTo($user) { public function reassignTo($user)
{
$this->setDbOwnerId( $user->getDbId() ); $this->setDbOwnerId( $user->getDbId() );
$this->save();
} }
} // CcFiles } // CcFiles

4
airtime_mvc/public/js/airtime/common/common.js
View file

@ -5,6 +5,10 @@ $(document).ready(function() {
afterDetachCSSClass: "floated-panel", afterDetachCSSClass: "floated-panel",
savePanelSpace: true savePanelSpace: true
}); });
//this statement tells the browser to fade out any success message after 5 seconds
setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000);
}); });
function adjustDateToServerDate(date, serverTimezoneOffset){ function adjustDateToServerDate(date, serverTimezoneOffset){

2
dev_tools/fabric/fab_liquidsoap_compile.cfg
View file

@ -1,2 +1,2 @@
[main] [main]
liquidsoap_tar_url = http://dl.dropbox.com/u/256410/airtime/liquidsoap-1.0.1-full.tar.gz liquidsoap_tar_url = http://dl.dropbox.com/u/256410/airtime/savonet.tar.gz

40
dev_tools/fabric/fab_liquidsoap_compile.py
View file

@ -176,12 +176,12 @@ def compile_liquidsoap(filename="liquidsoap"):
do_sudo('apt-get update') do_sudo('apt-get update')
do_sudo('apt-get upgrade -y --force-yes') do_sudo('apt-get upgrade -y --force-yes')
do_sudo('apt-get install -y --force-yes ocaml-findlib libao-ocaml-dev libportaudio-ocaml-dev ' + \ do_sudo('''apt-get install -y --force-yes ocaml-findlib libao-ocaml-dev libportaudio-ocaml-dev
'libmad-ocaml-dev libtaglib-ocaml-dev libalsa-ocaml-dev libtaglib-ocaml-dev libvorbis-ocaml-dev ' + \ libmad-ocaml-dev libtaglib-ocaml-dev libalsa-ocaml-dev libtaglib-ocaml-dev libvorbis-ocaml-dev
'libspeex-dev libspeexdsp-dev speex libladspa-ocaml-dev festival festival-dev ' + \ libspeex-dev libspeexdsp-dev speex libladspa-ocaml-dev festival festival-dev
'libsamplerate-dev libxmlplaylist-ocaml-dev libxmlrpc-light-ocaml-dev libflac-dev ' + \ libsamplerate-dev libxmlplaylist-ocaml-dev libxmlrpc-light-ocaml-dev libflac-dev
'libxml-dom-perl libxml-dom-xpath-perl patch autoconf libmp3lame-dev ' + \ libxml-dom-perl libxml-dom-xpath-perl patch autoconf libmp3lame-dev
'libcamomile-ocaml-dev libcamlimages-ocaml-dev libtool libpulse-dev libjack-dev camlidl') libcamomile-ocaml-dev libcamlimages-ocaml-dev libtool libpulse-dev libjack-dev camlidl libfaad-dev''')
root = '/home/martin/src' root = '/home/martin/src'
do_run('mkdir -p %s' % root) do_run('mkdir -p %s' % root)
@ -191,12 +191,22 @@ def compile_liquidsoap(filename="liquidsoap"):
do_run('mv %s %s/liquidsoap.tar.gz' % (tmpPath, root)) do_run('mv %s %s/liquidsoap.tar.gz' % (tmpPath, root))
do_run('cd %s && tar xzf liquidsoap.tar.gz' % root) do_run('cd %s && tar xzf liquidsoap.tar.gz' % root)
do_run('cd %s/liquidsoap-1.0.1-full && cp PACKAGES.minimal PACKAGES' % root) #do_run('cd %s/liquidsoap-1.0.1-full && cp PACKAGES.minimal PACKAGES' % root)
sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-portaudio', 'ocaml-portaudio') #sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-portaudio', 'ocaml-portaudio')
sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-alsa', 'ocaml-alsa') #sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-alsa', 'ocaml-alsa')
sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-pulseaudio', 'ocaml-pulseaudio') #sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-pulseaudio', 'ocaml-pulseaudio')
sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-faad', 'ocaml-faad') #sed('%s/liquidsoap-1.0.1-full/PACKAGES' % root, '#ocaml-faad', 'ocaml-faad')
do_run('cd %s/liquidsoap-1.0.1-full && ./bootstrap' % root) #do_run('cd %s/liquidsoap-1.0.1-full && ./bootstrap' % root)
do_run('cd %s/liquidsoap-1.0.1-full && ./configure' % root) #do_run('cd %s/liquidsoap-1.0.1-full && ./configure' % root)
do_run('cd %s/liquidsoap-1.0.1-full && make' % root) #do_run('cd %s/liquidsoap-1.0.1-full && make' % root)
get('%s/liquidsoap-1.0.1-full/liquidsoap-1.0.1/src/liquidsoap' % root, filename) #get('%s/liquidsoap-1.0.1-full/liquidsoap-1.0.1/src/liquidsoap' % root, filename)
do_run('cd %s/savonet && cp PACKAGES.minimal PACKAGES' % root)
sed('%s/savonet/PACKAGES' % root, '#ocaml-portaudio', 'ocaml-portaudio')
sed('%s/savonet/PACKAGES' % root, '#ocaml-alsa', 'ocaml-alsa')
sed('%s/savonet/PACKAGES' % root, '#ocaml-pulseaudio', 'ocaml-pulseaudio')
sed('%s/savonet/PACKAGES' % root, '#ocaml-faad', 'ocaml-faad')
do_run('cd %s/savonet && ./bootstrap' % root)
do_run('cd %s/savonet && ./configure' % root)
do_run('cd %s/savonet && make' % root)
get('%s/savonet/liquidsoap/src/liquidsoap' % root, filename)