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

Merge branch 'devel' into 2.3.x-saas

Browse source
This commit is contained in:
Martin Konecny 2013-01-18 17:14:11 -05:00
commit 210336d20a
8 changed files with 100 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/AudiopreviewController.php
View file

@ -46,7 +46,7 @@ class AudiopreviewController extends Zend_Controller_Action
} }
if ($type == "audioclip") { if ($type == "audioclip") {
$uri = "/api/get-media/file/".$audioFileID; $uri = $baseUrl."/api/get-media/file/".$audioFileID;
$media = Application_Model_StoredFile::Recall($audioFileID); $media = Application_Model_StoredFile::Recall($audioFileID);
$mime = $media->getPropelOrm()->getDbMime(); $mime = $media->getPropelOrm()->getDbMime();
} elseif ($type == "stream") { } elseif ($type == "stream") {

4
airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
View file

@ -36,8 +36,8 @@
?> ?>
<?php for ($j = 0; $j < $this->modRowMap[$i]; $j++) { <?php for ($j = 0; $j < $this->modRowMap[$i]; $j++) {
// determine if logic label should be 'and' or 'or' // determine if logic label should be 'and' or 'or'
if ($this->modRowMap[$i] > 1 && $j != $this->modRowMap[$i]-1) $logicLabel = 'or'; if ($this->modRowMap[$i] > 1 && $j != $this->modRowMap[$i]-1) $logicLabel = _('or');
else $logicLabel = 'and'; else $logicLabel = _('and');
$disabled = $this->element->getElement("sp_criteria_field_".$i."_".$j)->getAttrib('disabled') == 'disabled'?true:false; $disabled = $this->element->getElement("sp_criteria_field_".$i."_".$j)->getAttrib('disabled') == 'disabled'?true:false;
// determine if the next row is disabled and only display the logic label if it isn't // determine if the next row is disabled and only display the logic label if it isn't

1
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -116,7 +116,6 @@ var AIRTIME = (function(AIRTIME) {
alert($.i18n._("Please select a cursor position on timeline.")); alert($.i18n._("Please select a cursor position on timeline."));
return false; return false;
} }
console.log(aMediaIds);
AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds); AIRTIME.showbuilder.fnAdd(aMediaIds, aSchedIds);
}; };

1
airtime_mvc/public/js/airtime/library/library.js
View file

@ -1283,6 +1283,7 @@ $(document).ready(function() {
data = $("#edit-md-dialog form").serializeArray(); data = $("#edit-md-dialog form").serializeArray();
$.post(baseUrl+'library/edit-file-md', {format: "json", id: file_id, data: data}, function() { $.post(baseUrl+'library/edit-file-md', {format: "json", id: file_id, data: data}, function() {
$("#edit-md-dialog").dialog().remove(); $("#edit-md-dialog").dialog().remove();
oTable.fnStandingRedraw();
}); });
}); });

2
airtime_mvc/public/js/airtime/login/password-restore.js
View file

@ -1,3 +1,3 @@
function redirectToLogin(){ function redirectToLogin(){
window.location = "/Login" window.location = baseUrl+"/Login"
} }

1
install_minimal/upgrades/airtime-2.3.0/DbUpgrade.php
View file

@ -19,6 +19,7 @@ class AirtimeDatabaseUpgrade{
$database = $p_dbValues['database']['dbname']; $database = $p_dbValues['database']['dbname'];
$dir = __DIR__; $dir = __DIR__;
passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/data/schema.sql $database 2>&1 | grep -v \"will create implicit index\"");
passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/data/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\""); passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/data/upgrade.sql $database 2>&1 | grep -v \"will create implicit index\"");
} }
} }

88
install_minimal/upgrades/airtime-2.3.0/data/schema.sql
View file

@ -1,22 +1,76 @@
DELETE FROM cc_pref WHERE keystr = 'system_version'; CREATE SEQUENCE cc_listener_count_id_seq
INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.3.0'); START WITH 1
INCREMENT BY 1
NO MAXVALUE
NO MINVALUE
CACHE 1;
INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('off_air_meta', 'Airtime - offline', 'string'); CREATE SEQUENCE cc_locale_id_seq
INSERT INTO cc_pref("keystr", "valstr") VALUES('enable_replay_gain', 1); START WITH 1
INCREMENT BY 1
NO MAXVALUE
NO MINVALUE
CACHE 1;
--Make sure that cc_music_dir has a trailing '/' and cc_files does not have a leading '/' CREATE SEQUENCE cc_mount_name_id_seq
UPDATE cc_music_dir SET directory = directory || '/' where id in (select id from cc_music_dirs where substr(directory, length(directory)) != '/'); START WITH 1
UPDATE cc_files SET filepath = substring(filepath from 2) where id in (select id from cc_files where substring(filepath from 1 for 1) = '/') INCREMENT BY 1
NO MAXVALUE
NO MINVALUE
CACHE 1;
INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA'); CREATE SEQUENCE cc_timestamp_id_seq
START WITH 1
INCREMENT BY 1
NO MAXVALUE
NO MINVALUE
CACHE 1;
CREATE TABLE cc_listener_count (
id integer DEFAULT nextval('cc_listener_count_id_seq'::regclass) NOT NULL,
timestamp_id integer NOT NULL,
mount_name_id integer NOT NULL,
listener_count integer NOT NULL
);
CREATE TABLE cc_locale (
id integer DEFAULT nextval('cc_locale_id_seq'::regclass) NOT NULL,
locale_code character varying(16) NOT NULL,
locale_lang character varying(128) NOT NULL
);
CREATE TABLE cc_mount_name (
id integer DEFAULT nextval('cc_mount_name_id_seq'::regclass) NOT NULL,
mount_name character varying(255) NOT NULL
);
CREATE TABLE cc_timestamp (
id integer DEFAULT nextval('cc_timestamp_id_seq'::regclass) NOT NULL,
"timestamp" timestamp without time zone NOT NULL
);
ALTER TABLE cc_files
ADD COLUMN cuein interval DEFAULT '00:00:00'::interval,
ADD COLUMN cueout interval DEFAULT '00:00:00'::interval,
ADD COLUMN silan_check boolean DEFAULT false,
ADD COLUMN hidden boolean DEFAULT false;
ALTER TABLE cc_listener_count
ADD CONSTRAINT cc_listener_count_pkey PRIMARY KEY (id);
ALTER TABLE cc_locale
ADD CONSTRAINT cc_locale_pkey PRIMARY KEY (id);
ALTER TABLE cc_mount_name
ADD CONSTRAINT cc_mount_name_pkey PRIMARY KEY (id);
ALTER TABLE cc_timestamp
ADD CONSTRAINT cc_timestamp_pkey PRIMARY KEY (id);
ALTER TABLE cc_listener_count
ADD CONSTRAINT cc_mount_name_inst_fkey FOREIGN KEY (mount_name_id) REFERENCES cc_mount_name(id) ON DELETE CASCADE;
ALTER TABLE cc_listener_count
ADD CONSTRAINT cc_timestamp_inst_fkey FOREIGN KEY (timestamp_id) REFERENCES cc_timestamp(id) ON DELETE CASCADE;
INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_locale', 'en_CA');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('fr_FR', 'Français');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_DE', 'Deutsch');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('it_IT', 'Italiano');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ko_KR', '한국어');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ru_RU', 'Русский');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('es_ES', 'Español');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', '简体中文');

93
install_minimal/upgrades/airtime-2.3.0/data/upgrade.sql
View file

@ -1,76 +1,29 @@
CREATE SEQUENCE cc_listener_count_id_seq DELETE FROM cc_pref WHERE keystr = 'system_version';
START WITH 1 INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.3.0');
INCREMENT BY 1
NO MAXVALUE
NO MINVALUE
CACHE 1;
CREATE SEQUENCE cc_locale_id_seq INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('off_air_meta', 'Airtime - offline', 'string');
START WITH 1 INSERT INTO cc_pref("keystr", "valstr") VALUES('enable_replay_gain', 1);
INCREMENT BY 1
NO MAXVALUE
NO MINVALUE
CACHE 1;
CREATE SEQUENCE cc_mount_name_id_seq INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s1_admin_user', '', 'string');
START WITH 1 INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s1_admin_pass', '', 'string');
INCREMENT BY 1 INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s2_admin_user', '', 'string');
NO MAXVALUE INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s2_admin_pass', '', 'string');
NO MINVALUE INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s3_admin_user', '', 'string');
CACHE 1; INSERT INTO cc_stream_setting ("keyname", "value", "type") VALUES ('s3_admin_pass', '', 'string');
CREATE SEQUENCE cc_timestamp_id_seq --Make sure that cc_music_dir has a trailing '/' and cc_files does not have a leading '/'
START WITH 1 UPDATE cc_music_dir SET directory = directory || '/' where id in (select id from cc_music_dirs where substr(directory, length(directory)) != '/');
INCREMENT BY 1 UPDATE cc_files SET filepath = substring(filepath from 2) where id in (select id from cc_files where substring(filepath from 1 for 1) = '/')
NO MAXVALUE
NO MINVALUE
CACHE 1;
CREATE TABLE cc_listener_count ( INSERT INTO cc_pref("keystr", "valstr") VALUES('locale', 'en_CA');
id integer DEFAULT nextval('cc_listener_count_id_seq'::regclass) NOT NULL,
timestamp_id integer NOT NULL,
mount_name_id integer NOT NULL,
listener_count integer NOT NULL
);
CREATE TABLE cc_locale (
id integer DEFAULT nextval('cc_locale_id_seq'::regclass) NOT NULL,
locale_code character varying(16) NOT NULL,
locale_lang character varying(128) NOT NULL
);
CREATE TABLE cc_mount_name (
id integer DEFAULT nextval('cc_mount_name_id_seq'::regclass) NOT NULL,
mount_name character varying(255) NOT NULL
);
CREATE TABLE cc_timestamp (
id integer DEFAULT nextval('cc_timestamp_id_seq'::regclass) NOT NULL,
"timestamp" timestamp without time zone NOT NULL
);
ALTER TABLE cc_files
ADD COLUMN cuein interval DEFAULT '00:00:00'::interval,
ADD COLUMN cueout interval DEFAULT '00:00:00'::interval,
ADD COLUMN silan_check boolean DEFAULT false,
ADD COLUMN hidden boolean DEFAULT false;
ALTER TABLE cc_listener_count
ADD CONSTRAINT cc_listener_count_pkey PRIMARY KEY (id);
ALTER TABLE cc_locale
ADD CONSTRAINT cc_locale_pkey PRIMARY KEY (id);
ALTER TABLE cc_mount_name
ADD CONSTRAINT cc_mount_name_pkey PRIMARY KEY (id);
ALTER TABLE cc_timestamp
ADD CONSTRAINT cc_timestamp_pkey PRIMARY KEY (id);
ALTER TABLE cc_listener_count
ADD CONSTRAINT cc_mount_name_inst_fkey FOREIGN KEY (mount_name_id) REFERENCES cc_mount_name(id) ON DELETE CASCADE;
ALTER TABLE cc_listener_count
ADD CONSTRAINT cc_timestamp_inst_fkey FOREIGN KEY (timestamp_id) REFERENCES cc_timestamp(id) ON DELETE CASCADE;
INSERT INTO cc_pref("subjid", "keystr", "valstr") VALUES(1, 'user_locale', 'en_CA');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('en_CA', 'English');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('fr_FR', 'Français');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('de_DE', 'Deutsch');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('it_IT', 'Italiano');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ko_KR', '한국어');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('ru_RU', 'Русский');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('es_ES', 'Español');
INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', '简体中文');