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

fixed problems with not working out of a fresh install.

Browse source
This commit is contained in:
mkonecny 2010-12-16 16:36:51 -05:00
parent b53936b350
commit 9bfb6b53b8
5 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/controllers/ApiController.php
View file

@ -36,7 +36,7 @@ class ApiController extends Zend_Controller_Action
}
public function mediaAction()
public function getMediaAction()
{
global $CC_CONFIG;
@ -203,4 +203,4 @@ class ApiController extends Zend_Controller_Action
}
}
?>
?>

4
application/models/StoredFile.php
View file

@ -1697,7 +1697,7 @@ class StoredFile {
{
global $CC_CONFIG;
return "http://".$CC_CONFIG["storageUrlHost"]
.$CC_CONFIG["apiPath"]."getMedia/file/"
.$CC_CONFIG["apiPath"]."get-media/file/"
.$this->gunid.".".$this->getFileExtension();
}
@ -1784,4 +1784,4 @@ class StoredFile {
}
}
?>
?>

2
build/schema.xml
View file

@ -211,6 +211,8 @@
<column name="fade_out" phpName="FadeOut" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="cue_in" phpName="CueIn" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="cue_out" phpName="CueOut" type="TIME" required="false" defaultValue="00:00:00"/>
<column name="schedule_group_played" phpName="ScheduleGroupPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
<column name="media_item_played" phpName="MediaItemPlayed" type="BOOLEAN" required="false" defaultValue="0"/>
</table>
<table name="cc_sess" phpName="CcSess">
<column name="sessid" phpName="Sessid" type="CHAR" size="32" primaryKey="true" required="true"/>

2
build/sql/schema.sql
View file

@ -306,6 +306,8 @@ CREATE TABLE "cc_schedule"
"fade_out" TIME default '00:00:00',
"cue_in" TIME default '00:00:00',
"cue_out" TIME default '00:00:00',
"schedule_group_played" BOOLEAN default 'f',
"media_item_played" BOOLEAN default 'f',
PRIMARY KEY ("id")
);

2
pypo/install/pypo-install.py
View file

@ -32,7 +32,7 @@ def create_user(username):
if (output[0:3] != "uid"):
# Make the pypo user
print "Creating user "+username
os.system("adduser --system --quiet --group --disabled-login "+username)
os.system("adduser --system --quiet --group --shell /bin/bash "+username)
else:
print "User already exists."