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

application/controllers/UserController.php

@@ -19,8 +19,6 @@ class UserController extends Zend_Controller_Action
 
     public function addUserAction()
     {
-        
-        
         $this->view->headScript()->appendFile('/js/datatables/js/jquery.dataTables.js','text/javascript');
         $this->view->headScript()->appendFile('/js/airtime/user/user.js','text/javascript');
         $request = $this->getRequest();
@@ -59,7 +57,6 @@ class UserController extends Zend_Controller_Action
         $post = $this->getRequest()->getPost();
         $users = User::getUsersDataTablesInfo($post);
                  
-                        
         die(json_encode($users));
     }
 

application/forms/AddShowWho.php

@@ -22,8 +22,7 @@ class Application_Form_AddShowWho extends Zend_Form_SubForm
 		//Add hosts selection
 		$hosts = new Zend_Form_Element_MultiCheckbox('add_show_hosts');
 		$hosts->setLabel('Hosts:')
-			->setMultiOptions($options)
-			->setRequired(true);
+			->setMultiOptions($options);
 
 		$this->addElement($hosts);
     }

application/models/Shows.php

@@ -147,6 +147,7 @@ class Show {
 		    }
         }
 		
+        if(is_array($data['add_show_hosts'])) {
             //add selected hosts to cc_show_hosts table.
 		    foreach ($data['add_show_hosts'] as $host) {
 			    $showHost = new CcShowHosts();
@@ -154,6 +155,7 @@ class Show {
 			    $showHost->setDbHost($host);
 			    $showHost->save();
 		    }
+        }
 
         Show::populateShowUntilLastGeneratedDate($showId);
 	}

application/models/Users.php

@@ -120,7 +120,7 @@ class User {
 	}
 
 	public static function getHosts($search=NULL) {
-		return User::getUsers(array('H', 'A'), $search);
+		return User::getUsers(array('H'), $search);
 	}
     
 	public static function getUsersDataTablesInfo($datatables_post) {

application/views/scripts/schedule/add-show-form.phtml

@@ -4,7 +4,8 @@
         <button id="add-show-submit" class="right-floated">Add this show</button>
     </div>
     <div class="clear"></div>
-    <div id="schedule-show-what">
+    <h3 class="collapsible-header"><span class="arrow-icon"></span>What</h3>
+    <div id="schedule-show-what" class="collapsible-content">
     <?php echo $this->what ?>
     </div>
     <h3 class="collapsible-header"><span class="arrow-icon"></span>When</h3>

public/js/airtime/schedule/add-show.js

@@ -181,6 +181,9 @@ function setAddShowEvents() {
 
 function showErrorSections() {
 
+    if($("#schedule-show-what .errors").length > 0) {
+        $("#schedule-show-what").show();
+    }
     if($("#schedule-show-when .errors").length > 0) {
         $("#schedule-show-when").show();
     }