dynamic / silverstripe-locator

code/LocationCategory.php

Indentation +12 added lines, -12 removed lines

@@ -2,20 +2,20 @@
 
 class LocationCategory extends DataObject
 {
-    private static $db = array(
-        'Name' => 'Varchar(100)',
-    );
+	private static $db = array(
+		'Name' => 'Varchar(100)',
+	);
 
-    private static $has_many = array(
-        'Locations' => 'Location',
-    );
+	private static $has_many = array(
+		'Locations' => 'Location',
+	);
 
-    private static $belogs_many_many = array(
-        'Locators' => 'Locator'
-    );
+	private static $belogs_many_many = array(
+		'Locators' => 'Locator'
+	);
 
-    private static $singular_name = "Category";
-    Private static $plural_name = "Categories";
+	private static $singular_name = "Category";
+	Private static $plural_name = "Categories";
 
-    private static $default_sort = 'Name';
+	private static $default_sort = 'Name';
 }

code/Locator.php

Indentation +188 added lines, -188 removed lines

@@ -2,141 +2,141 @@ 
 
 class Locator extends Page
 {
-    private static $db = array(
-        'AutoGeocode' => 'Boolean',
-        'ModalWindow' => 'Boolean',
-        'Unit' => 'Enum("m,km","m")',
-    );
-
-    private static $many_many = array(
-        'Categories' => 'LocationCategory',
-    );
-
-    private static $defaults = array(
-        'AutoGeocode' => true,
-    );
-
-    private static $singular_name = 'Locator';
-    private static $plural_name = 'Locators';
-    private static $description = 'Find locations on a map';
-
-    public function getCMSFields()
-    {
-        $fields = parent::getCMSFields();
-
-        // Settings
-        $fields->addFieldsToTab('Root.Settings', array(
-            HeaderField::create('DisplayOptions', 'Display Options', 3),
-            OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')),
-            CheckboxField::create('AutoGeocode', 'Auto Geocode - Automatically filter map results based on user location')
-                ->setDescription('Note: if any locations are set as featured, the auto geocode is automatically disabled.'),
-            CheckboxField::create('ModalWindow', 'Modal Window - Show Map results in a modal window'),
-        ));
-
-        // Filter categories
-        $config = GridFieldConfig_RelationEditor::create();
-        if (class_exists('GridFieldAddExistingSearchButton')) {
-            $config->removeComponentsByType('GridFieldAddExistingAutocompleter');
-            $config->addComponent(new GridFieldAddExistingSearchButton());
-        }
-        $categories = $this->Categories();
-        $categoriesField = GridField::create('Categories', 'Categories', $categories, $config)
-            ->setDescription('only show locations from the selected category');
-
-            // Filter
-            $fields->addFieldsToTab('Root.Filter', array(
-                HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3),
-                $categoriesField,
-            ));
-
-        $this->extend('updateCMSFields', $fields);
-
-        return $fields;
-    }
-
-    public static function getLocations($filter = array(), $exclude = array(), $filterAny = array())
-    {
-        $filter['ShowInLocator'] = true;
-        $exclude['Lat'] = 0;
-
-        $Locations = Location::get()->exclude($exclude)->filter($filter)->filterAny($filterAny);
-
-        return $Locations;
-    }
-
-    public function getAreLocations()
-    {
-        return self::getLocations();
-    }
-
-    public function getAllCategories()
-    {
-        return LocationCategory::get();
-    }
-
-    public static function getPageCategories($id = null)
-    {
-        if ($id) {
-            if ($locator = Locator::get()->byID($id)) {
-                return $locator->Categories();
-            }
-            return false;
-        }
-        return false;
-    }
+	private static $db = array(
+		'AutoGeocode' => 'Boolean',
+		'ModalWindow' => 'Boolean',
+		'Unit' => 'Enum("m,km","m")',
+	);
+
+	private static $many_many = array(
+		'Categories' => 'LocationCategory',
+	);
+
+	private static $defaults = array(
+		'AutoGeocode' => true,
+	);
+
+	private static $singular_name = 'Locator';
+	private static $plural_name = 'Locators';
+	private static $description = 'Find locations on a map';
+
+	public function getCMSFields()
+	{
+		$fields = parent::getCMSFields();
+
+		// Settings
+		$fields->addFieldsToTab('Root.Settings', array(
+			HeaderField::create('DisplayOptions', 'Display Options', 3),
+			OptionsetField::create('Unit', 'Unit of measure', array('m' => 'Miles', 'km' => 'Kilometers')),
+			CheckboxField::create('AutoGeocode', 'Auto Geocode - Automatically filter map results based on user location')
+				->setDescription('Note: if any locations are set as featured, the auto geocode is automatically disabled.'),
+			CheckboxField::create('ModalWindow', 'Modal Window - Show Map results in a modal window'),
+		));
+
+		// Filter categories
+		$config = GridFieldConfig_RelationEditor::create();
+		if (class_exists('GridFieldAddExistingSearchButton')) {
+			$config->removeComponentsByType('GridFieldAddExistingAutocompleter');
+			$config->addComponent(new GridFieldAddExistingSearchButton());
+		}
+		$categories = $this->Categories();
+		$categoriesField = GridField::create('Categories', 'Categories', $categories, $config)
+			->setDescription('only show locations from the selected category');
+
+			// Filter
+			$fields->addFieldsToTab('Root.Filter', array(
+				HeaderField::create('CategoryOptionsHeader', 'Location Filtering', 3),
+				$categoriesField,
+			));
+
+		$this->extend('updateCMSFields', $fields);
+
+		return $fields;
+	}
+
+	public static function getLocations($filter = array(), $exclude = array(), $filterAny = array())
+	{
+		$filter['ShowInLocator'] = true;
+		$exclude['Lat'] = 0;
+
+		$Locations = Location::get()->exclude($exclude)->filter($filter)->filterAny($filterAny);
+
+		return $Locations;
+	}
+
+	public function getAreLocations()
+	{
+		return self::getLocations();
+	}
+
+	public function getAllCategories()
+	{
+		return LocationCategory::get();
+	}
+
+	public static function getPageCategories($id = null)
+	{
+		if ($id) {
+			if ($locator = Locator::get()->byID($id)) {
+				return $locator->Categories();
+			}
+			return false;
+		}
+		return false;
+	}
 }
 
 class Locator_Controller extends Page_Controller
 {
-    // allowed actions
-    private static $allowed_actions = array('xml');
+	// allowed actions
+	private static $allowed_actions = array('xml');
 
-    // Set Requirements based on input from CMS
-    public function init()
-    {
-        parent::init();
+	// Set Requirements based on input from CMS
+	public function init()
+	{
+		parent::init();
 
-        $themeDir = SSViewer::get_theme_folder();
+		$themeDir = SSViewer::get_theme_folder();
 
-        Requirements::javascript('framework/thirdparty/jquery/jquery.js');
-        if (Locator::getLocations()) {
-            Requirements::javascript('http://maps.google.com/maps/api/js?sensor=false');
-            Requirements::javascript('locator/thirdparty/handlebars/handlebars-v1.3.0.js');
-            Requirements::javascript('locator/thirdparty/jquery-store-locator/js/jquery.storelocator.js');
-        }
+		Requirements::javascript('framework/thirdparty/jquery/jquery.js');
+		if (Locator::getLocations()) {
+			Requirements::javascript('http://maps.google.com/maps/api/js?sensor=false');
+			Requirements::javascript('locator/thirdparty/handlebars/handlebars-v1.3.0.js');
+			Requirements::javascript('locator/thirdparty/jquery-store-locator/js/jquery.storelocator.js');
+		}
 
-        Requirements::css('locator/css/map.css');
+		Requirements::css('locator/css/map.css');
 
-        $featured = (Locator::getLocations(array('Featured' => 1))->count() > 0) ?
-            'featuredLocations: true' :
-            'featuredLocations: false';
+		$featured = (Locator::getLocations(array('Featured' => 1))->count() > 0) ?
+			'featuredLocations: true' :
+			'featuredLocations: false';
 
-        // map config based on user input in Settings tab
-        // AutoGeocode or Full Map
-        $load = ($this->data()->AutoGeocode) ?
-            'autoGeocode: true, fullMapStart: false,' :
-            'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,';
+		// map config based on user input in Settings tab
+		// AutoGeocode or Full Map
+		$load = ($this->data()->AutoGeocode) ?
+			'autoGeocode: true, fullMapStart: false,' :
+			'autoGeocode: false, fullMapStart: true, storeLimit: 1000, maxDistance: true,';
 
-        $base = Director::baseFolder();
-        $themePath = $base.'/'.$themeDir;
+		$base = Director::baseFolder();
+		$themePath = $base.'/'.$themeDir;
 
-        $listTemplatePath = (file_exists($themePath.'/templates/location-list-description.html')) ?
-            $themeDir.'/templates/location-list-description.html' :
-            'locator/templates/location-list-description.html';
-        $infowindowTemplatePath = (file_exists($themePath.'/templates/infowindow-description.html')) ?
-            $themeDir.'/templates/infowindow-description.html' :
-            'locator/templates/infowindow-description.html';
+		$listTemplatePath = (file_exists($themePath.'/templates/location-list-description.html')) ?
+			$themeDir.'/templates/location-list-description.html' :
+			'locator/templates/location-list-description.html';
+		$infowindowTemplatePath = (file_exists($themePath.'/templates/infowindow-description.html')) ?
+			$themeDir.'/templates/infowindow-description.html' :
+			'locator/templates/infowindow-description.html';
 
-        // in page or modal
-        $modal = ($this->data()->ModalWindow) ? 'modalWindow: true' : 'modalWindow: false';
+		// in page or modal
+		$modal = ($this->data()->ModalWindow) ? 'modalWindow: true' : 'modalWindow: false';
 
-        $kilometer = ($this->data()->Unit == 'km') ? 'lengthUnit: "km"' : 'lengthUnit: "m"';
+		$kilometer = ($this->data()->Unit == 'km') ? 'lengthUnit: "km"' : 'lengthUnit: "m"';
 
-        $link = $this->Link().'xml.xml';
+		$link = $this->Link().'xml.xml';
 
-        // init map
-        if (Locator::getLocations()) {
-            Requirements::customScript("
+		// init map
+		if (Locator::getLocations()) {
+			Requirements::customScript("
                 $(function($) {
                     $('#map-container').storeLocator({
                         ".$load."
@@ -157,73 +157,73 @@ 
                     });
                 });
             ');
-        }
-    }
-
-    /**
-     * Find all locations for map.
-     *
-     * Will return a XML feed of all locations marked "show in locator".
-     *
-     * @return XML file
-     *
-     * @todo rename/refactor to allow for json/xml
-     * @todo allow $filter to run off of getVars key/val pair
-     */
-    public function xml(SS_HTTPRequest $request)
-    {
-        $filter = array();
-        $exclude = array();
-        $filterAny = array();
-
-        //if a category filter selected
-        if ($this->Categories()->exists()) {
-            $categories = $this->Categories();
-            foreach ($categories as $category) {
-                $filterAny['CategoryID'] = $category->ID;
-            }
-        }
-
-        $Locations = Locator::getLocations($filter, $exclude, $filterAny);
-
-        return $this->customise(array(
-            'Locations' => $Locations,
-        ))->renderWith('LocationXML');
-    }
-
-    /**
-     * LocationSearch form.
-     *
-     * Search form for locations, updates map and results list via AJAX
-     *
-     * @return Form
-     */
-    public function LocationSearch()
-    {
-        $fields = FieldList::create(
-            $address = TextField::create('address', '')
-        );
-        $address->setAttribute('placeholder', 'address or zip code');
-
-        $locatorCategories = Locator::getPageCategories($this->ID);
-
-        if (LocationCategory::get()->Count() > 0 && $locatorCategories && $locatorCategories->Count() != 1) {
-            $categories = LocationCategory::get();
-
-            if ($categories->count() > 0) {
-                $fields->push(
-                    DropdownField::create(
-                        'category',
-                        '',
-                        $categories->map('Title', 'Title')
-                    )->setEmptyString('Select Category'));
-            }
-        }
-
-        $actions = FieldList::create(
-            FormAction::create('', 'Search')
-        );
-
-        return Form::create($this, 'LocationSearch', $fields, $actions);
-    }
+		}
+	}
+
+	/**
+	 * Find all locations for map.
+	 *
+	 * Will return a XML feed of all locations marked "show in locator".
+	 *
+	 * @return XML file
+	 *
+	 * @todo rename/refactor to allow for json/xml
+	 * @todo allow $filter to run off of getVars key/val pair
+	 */
+	public function xml(SS_HTTPRequest $request)
+	{
+		$filter = array();
+		$exclude = array();
+		$filterAny = array();
+
+		//if a category filter selected
+		if ($this->Categories()->exists()) {
+			$categories = $this->Categories();
+			foreach ($categories as $category) {
+				$filterAny['CategoryID'] = $category->ID;
+			}
+		}
+
+		$Locations = Locator::getLocations($filter, $exclude, $filterAny);
+
+		return $this->customise(array(
+			'Locations' => $Locations,
+		))->renderWith('LocationXML');
+	}
+
+	/**
+	 * LocationSearch form.
+	 *
+	 * Search form for locations, updates map and results list via AJAX
+	 *
+	 * @return Form
+	 */
+	public function LocationSearch()
+	{
+		$fields = FieldList::create(
+			$address = TextField::create('address', '')
+		);
+		$address->setAttribute('placeholder', 'address or zip code');
+
+		$locatorCategories = Locator::getPageCategories($this->ID);
+
+		if (LocationCategory::get()->Count() > 0 && $locatorCategories && $locatorCategories->Count() != 1) {
+			$categories = LocationCategory::get();
+
+			if ($categories->count() > 0) {
+				$fields->push(
+					DropdownField::create(
+						'category',
+						'',
+						$categories->map('Title', 'Title')
+					)->setEmptyString('Select Category'));
+			}
+		}
+
+		$actions = FieldList::create(
+			FormAction::create('', 'Search')
+		);
+
+		return Form::create($this, 'LocationSearch', $fields, $actions);
+	}
 }

tests/LocatorTest.php

Indentation +53 added lines, -53 removed lines

@@ -2,69 +2,69 @@
 
 class LocatorTest extends Locator_Test
 {
-    public function testGetCMSFields()
-    {
-        $object = new Locator();
-        $fieldset = $object->getCMSFields();
-        $this->assertTrue(is_a($fieldset, 'FieldList'));
-    }
+	public function testGetCMSFields()
+	{
+		$object = new Locator();
+		$fieldset = $object->getCMSFields();
+		$this->assertTrue(is_a($fieldset, 'FieldList'));
+	}
 
-    public function testGetLocations()
-    {
-        $locator = singleton('Locator');
-        $count = Location::get()->filter('ShowInLocator', 1)->exclude('Lat', 0)->Count();
-        $this->assertEquals($locator->getLocations()->Count(), $count);
-    }
+	public function testGetLocations()
+	{
+		$locator = singleton('Locator');
+		$count = Location::get()->filter('ShowInLocator', 1)->exclude('Lat', 0)->Count();
+		$this->assertEquals($locator->getLocations()->Count(), $count);
+	}
 
-    public function testGetAreLocations()
-    {
-        $locator = singleton('Locator');
-        $this->assertEquals($locator->getLocations(), $locator->getAreLocations());
-    }
+	public function testGetAreLocations()
+	{
+		$locator = singleton('Locator');
+		$this->assertEquals($locator->getLocations(), $locator->getAreLocations());
+	}
 
-    public function testGetAllCategories()
-    {
-        $locator = singleton('Locator');
-        $count = LocationCategory::get();
-        $this->assertEquals($locator->getAllCategories(), $count);
-    }
+	public function testGetAllCategories()
+	{
+		$locator = singleton('Locator');
+		$count = LocationCategory::get();
+		$this->assertEquals($locator->getAllCategories(), $count);
+	}
 
-    public function testGetPageCategories()
-    {
-        $locator = Locator::create();
-        $this->assertFalse($locator->getPageCategories());
+	public function testGetPageCategories()
+	{
+		$locator = Locator::create();
+		$this->assertFalse($locator->getPageCategories());
 
-        $this->assertFalse($locator->getPageCategories(500));
+		$this->assertFalse($locator->getPageCategories(500));
 
-        $locator->write();
-        $category = $this->objFromFixture('LocationCategory', 'service');
-        $locator->Categories()->add($category);
-        $this->assertEquals($locator->getPageCategories($locator->ID), $locator->Categories());
-    }
+		$locator->write();
+		$category = $this->objFromFixture('LocationCategory', 'service');
+		$locator->Categories()->add($category);
+		$this->assertEquals($locator->getPageCategories($locator->ID), $locator->Categories());
+	}
 
-    public function testInit()
-    {
-    }
+	public function testInit()
+	{
+	}
 
-    public function testXml()
-    {
-    }
+	public function testXml()
+	{
+	}
 
-    public function testLocationSearch()
-    {
-        $locator = $this->objFromFixture('Locator', 'locator1');
-        $object = Locator_Controller::create($locator);
-        $form = $object->LocationSearch();
-        $this->assertTrue(is_a($form, 'Form'));
+	public function testLocationSearch()
+	{
+		$locator = $this->objFromFixture('Locator', 'locator1');
+		$object = Locator_Controller::create($locator);
+		$form = $object->LocationSearch();
+		$this->assertTrue(is_a($form, 'Form'));
         
-        $category = $this->objFromFixture('LocationCategory', 'service');
-        $category2 = $this->objFromFixture('LocationCategory', 'manufacturing');
-        $locator->Categories()->add($category);
-        $locator->Categories()->add($category2);
+		$category = $this->objFromFixture('LocationCategory', 'service');
+		$category2 = $this->objFromFixture('LocationCategory', 'manufacturing');
+		$locator->Categories()->add($category);
+		$locator->Categories()->add($category2);
 
-        $form = $object->LocationSearch();
-        $fields = $form->Fields();
-        $this->assertNotNull($fields->fieldByName('category'));
+		$form = $object->LocationSearch();
+		$fields = $form->Fields();
+		$this->assertNotNull($fields->fieldByName('category'));
         
-    }
+	}
 }