Merge branch '2.5.x' into 2.5.x-installer

2015-01-22 17:36:12 -05:00 · 2015-01-22 17:36:12 -05:00 · 6e43505379
commit 6e43505379
parent ca9724ec5f 239aae029e
27 changed files with 166 additions and 39 deletions
--- a/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.xml
+++ b/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -338,4 +340,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value>1</value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -134,4 +136,4 @@
            <value>1</value>
        </row>
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -104,4 +106,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value>1</value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -134,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -94,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -94,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -84,4 +86,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -248,4 +250,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -94,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -94,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -134,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -270,4 +272,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -134,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -260,4 +262,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -94,4 +96,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -157,4 +159,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value>1</value>
            <value>1</value>
+            <value></value>
        </row>
    </table>

@ -134,4 +136,4 @@
            <value>1</value>
        </row>
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -134,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value></value>
+            <value></value>
        </row>
    </table>

@ -134,4 +136,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -104,4 +106,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>
--- a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.xml
+++ b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.xml
@ -14,6 +14,7 @@
        <column>live_stream_pass</column>
        <column>linked</column>
        <column>is_linkable</column>
+        <column>image_path</column>
        <row>
            <value>1</value>
            <value>test show</value>
@ -28,6 +29,7 @@
            <null />
            <value></value>
            <value>1</value>
+            <value></value>
        </row>
   </table>

@ -84,4 +86,4 @@

    <table name="cc_show_hosts">
    </table>
-</dataset>
+</dataset>