Version 4.3.0

applications/calendar/extensions/core/CreateMenu/Event.php

@@ -30,14 +30,26 @@ class _Event
 	 */
 	public function getItems()
 	{
-		if ( \IPS\calendar\Calendar::canOnAny( 'add' ) )
+		if ( \IPS\calendar\Calendar::canOnAny( 'add', NULL, \IPS\Settings::i()->club_nodes_in_apps ? array() : array( array( 'cal_club_id IS NULL' ) ) ) )
 		{
-			return array( 'event' => array(
-				'link' => \IPS\Http\Url::internal( "app=calendar&module=calendar&controller=submit&_new=1", 'front', 'calendar_submit' ),
-				'extraData'	=> array( 'data-ipsDialog' => true, 'data-ipsDialog-size' => "narrow", ),
-				'title' 	=> 'select_calendar'
-			)
-			);
+			if ( !\IPS\Settings::i()->club_nodes_in_apps and $theOnlyNode = \IPS\calendar\Calendar::theOnlyNode() )
+			{
+				return array(
+					'event' => array(
+						'link' 	=> \IPS\Http\Url::internal( "app=calendar&module=calendar&controller=submit&do=submit&id=" . $theOnlyNode->_id, 'front', 'calendar_submit' ),
+					)
+				);
+			}
+			else
+			{
+				return array(
+					'event' => array(
+						'link' => \IPS\Http\Url::internal( "app=calendar&module=calendar&controller=submit&_new=1", 'front', 'calendar_submit' ),
+						'extraData'	=> array( 'data-ipsDialog' => true, 'data-ipsDialog-size' => "narrow", ),
+						'title' 	=> 'select_calendar'
+					)
+				);
+			}
 		}
 
 		return array();