dynamic / silverstripe-locator

code/objects/Location.php

Indentation +214 added lines, -214 removed lines

@@ -17,245 +17,245 @@
 class Location extends DataObject implements PermissionProvider
 {
 
-    /**
-     * @var array
-     */
-    private static $db = array(
-        'Title' => 'Varchar(255)',
-        'Featured' => 'Boolean',
-        'Website' => 'Varchar(255)',
-        'Phone' => 'Varchar(40)',
-        'Email' => 'Varchar(255)',
-        'EmailAddress' => 'Varchar(255)',
-        'ShowInLocator' => 'Boolean',
-        'Import_ID' => 'Int',
-    );
+	/**
+	 * @var array
+	 */
+	private static $db = array(
+		'Title' => 'Varchar(255)',
+		'Featured' => 'Boolean',
+		'Website' => 'Varchar(255)',
+		'Phone' => 'Varchar(40)',
+		'Email' => 'Varchar(255)',
+		'EmailAddress' => 'Varchar(255)',
+		'ShowInLocator' => 'Boolean',
+		'Import_ID' => 'Int',
+	);
 
-    /**
-     * @var array
-     */
-    private static $has_one = array(
-        'Category' => 'LocationCategory',
-    );
+	/**
+	 * @var array
+	 */
+	private static $has_one = array(
+		'Category' => 'LocationCategory',
+	);
 
-    /**
-     * @var array
-     */
-    private static $casting = array(
-        'distance' => 'Int',
-    );
+	/**
+	 * @var array
+	 */
+	private static $casting = array(
+		'distance' => 'Int',
+	);
 
-    /**
-     * @var string
-     */
-    private static $default_sort = 'Title';
+	/**
+	 * @var string
+	 */
+	private static $default_sort = 'Title';
 
-    /**
-     * @var array
-     */
-    private static $defaults = array(
-        'ShowInLocator' => true,
-    );
+	/**
+	 * @var array
+	 */
+	private static $defaults = array(
+		'ShowInLocator' => true,
+	);
 
-    /**
-     * @var string
-     */
-    private static $singular_name = 'Location';
-    /**
-     * @var string
-     */
-    private static $plural_name = 'Locations';
+	/**
+	 * @var string
+	 */
+	private static $singular_name = 'Location';
+	/**
+	 * @var string
+	 */
+	private static $plural_name = 'Locations';
 
-    /**
-     * api access via Restful Server module
-     *
-     * @var bool
-     */
-    private static $api_access = true;
+	/**
+	 * api access via Restful Server module
+	 *
+	 * @var bool
+	 */
+	private static $api_access = true;
 
-    /**
-     * search fields for Model Admin
-     *
-     * @var array
-     */
-    private static $searchable_fields = array(
-        'Title',
-        'Address',
-        'Suburb',
-        'State',
-        'Postcode',
-        'Country',
-        'Website',
-        'Phone',
-        'Email',
-        'Category.ID',
-        'ShowInLocator',
-        'Featured',
-    );
+	/**
+	 * search fields for Model Admin
+	 *
+	 * @var array
+	 */
+	private static $searchable_fields = array(
+		'Title',
+		'Address',
+		'Suburb',
+		'State',
+		'Postcode',
+		'Country',
+		'Website',
+		'Phone',
+		'Email',
+		'Category.ID',
+		'ShowInLocator',
+		'Featured',
+	);
 
-    /**
-     * columns for grid field
-     *
-     * @var array
-     */
-    private static $summary_fields = array(
-        'Title',
-        'Address',
-        'Suburb',
-        'State',
-        'Postcode',
-        'Country',
-        'Category.Name',
-        'ShowInLocator.NiceAsBoolean',
-        'Featured.NiceAsBoolean',
-        'Coords',
-    );
+	/**
+	 * columns for grid field
+	 *
+	 * @var array
+	 */
+	private static $summary_fields = array(
+		'Title',
+		'Address',
+		'Suburb',
+		'State',
+		'Postcode',
+		'Country',
+		'Category.Name',
+		'ShowInLocator.NiceAsBoolean',
+		'Featured.NiceAsBoolean',
+		'Coords',
+	);
 
-    /**
-     * Coords status for $summary_fields
-     *
-     * @return string
-     */
-    public function getCoords()
-    {
-        return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
-    }
+	/**
+	 * Coords status for $summary_fields
+	 *
+	 * @return string
+	 */
+	public function getCoords()
+	{
+		return ($this->Lat != 0 && $this->Lng != 0) ? 'true' : 'false';
+	}
 
-    /**
-     * custom labels for fields
-     *
-     * @param bool $includerelations
-     * @return array|string
-     */
-    public function fieldLabels($includerelations = true)
-    {
-        $labels = parent::fieldLabels($includerelations);
+	/**
+	 * custom labels for fields
+	 *
+	 * @param bool $includerelations
+	 * @return array|string
+	 */
+	public function fieldLabels($includerelations = true)
+	{
+		$labels = parent::fieldLabels($includerelations);
 
-        $labels['Title'] = 'Name';
-        $labels['Suburb'] = 'City';
-        $labels['Postcode'] = 'Postal Code';
-        $labels['ShowInLocator'] = 'Show';
-        $labels['ShowInLocator.NiceAsBoolean'] = 'Show';
-        $labels['Category.Name'] = 'Category';
-        $labels['Category.ID'] = 'Category';
-        $labels['Email'] = 'Email';
-        $labels['Featured.NiceAsBoolean'] = 'Featured';
-        $labels['Coords'] = 'Coords';
+		$labels['Title'] = 'Name';
+		$labels['Suburb'] = 'City';
+		$labels['Postcode'] = 'Postal Code';
+		$labels['ShowInLocator'] = 'Show';
+		$labels['ShowInLocator.NiceAsBoolean'] = 'Show';
+		$labels['Category.Name'] = 'Category';
+		$labels['Category.ID'] = 'Category';
+		$labels['Email'] = 'Email';
+		$labels['Featured.NiceAsBoolean'] = 'Featured';
+		$labels['Coords'] = 'Coords';
 
-        return $labels;
-    }
+		return $labels;
+	}
 
-    /**
-     * @return FieldList
-     */
-    public function getCMSFields()
-    {
-        $fields = FieldList::create(
-            new TabSet(
-                $name = 'Root',
-                new Tab(
-                    $title = 'Main',
-                    HeaderField::create('ContactHD', 'Contact Information'),
-                    TextField::create('Title', 'Name'),
-                    TextField::create('Phone'),
-                    EmailField::create('Email', 'Email'),
-                    TextField::create('Website')
-                        ->setAttribute('placeholder', 'http://'),
-                    DropdownField::create('CategoryID', 'Category', LocationCategory::get()->map('ID', 'Title'))
-                        ->setEmptyString('-- select --'),
-                    CheckboxField::create('ShowInLocator', 'Show in results')
-                        ->setDescription('Location will be included in results list'),
-                    CheckboxField::create('Featured')
-                        ->setDescription('Location will show at/near the top of the results list')
-                )
-            )
-        );
+	/**
+	 * @return FieldList
+	 */
+	public function getCMSFields()
+	{
+		$fields = FieldList::create(
+			new TabSet(
+				$name = 'Root',
+				new Tab(
+					$title = 'Main',
+					HeaderField::create('ContactHD', 'Contact Information'),
+					TextField::create('Title', 'Name'),
+					TextField::create('Phone'),
+					EmailField::create('Email', 'Email'),
+					TextField::create('Website')
+						->setAttribute('placeholder', 'http://'),
+					DropdownField::create('CategoryID', 'Category', LocationCategory::get()->map('ID', 'Title'))
+						->setEmptyString('-- select --'),
+					CheckboxField::create('ShowInLocator', 'Show in results')
+						->setDescription('Location will be included in results list'),
+					CheckboxField::create('Featured')
+						->setDescription('Location will show at/near the top of the results list')
+				)
+			)
+		);
 
-        // allow to be extended via DataExtension
-        $this->extend('updateCMSFields', $fields);
+		// allow to be extended via DataExtension
+		$this->extend('updateCMSFields', $fields);
 
-        // override Suburb field name
-        $fields->dataFieldByName('Suburb')->setTitle('City');
+		// override Suburb field name
+		$fields->dataFieldByName('Suburb')->setTitle('City');
 
-        $fields->removeByName(array(
-            'Import_ID',
-        ));
+		$fields->removeByName(array(
+			'Import_ID',
+		));
 
-        return $fields;
-    }
+		return $fields;
+	}
 
-    /**
-     * @return ValidationResult
-     */
-    public function validate()
-    {
-        $result = parent::validate();
+	/**
+	 * @return ValidationResult
+	 */
+	public function validate()
+	{
+		$result = parent::validate();
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * @return bool|string
-     */
-    public function EmailAddress()
-    {
-        Deprecation::notice('3.0', 'Use "$Email" instead.');
-        if ($this->Email) {
-            return $this->Email;
-        } elseif ($this->EmailAddress) {
-            return $this->EmailAddress;
-        }
+	/**
+	 * @return bool|string
+	 */
+	public function EmailAddress()
+	{
+		Deprecation::notice('3.0', 'Use "$Email" instead.');
+		if ($this->Email) {
+			return $this->Email;
+		} elseif ($this->EmailAddress) {
+			return $this->EmailAddress;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * @param null|Member $member
-     *
-     * @return bool
-     */
-    public function canView($member = null)
-    {
-        return true;
-    }
+	/**
+	 * @param null|Member $member
+	 *
+	 * @return bool
+	 */
+	public function canView($member = null)
+	{
+		return true;
+	}
 
-    /**
-     * @param null|Member $member
-     * @return bool|int
-     */
-    public function canEdit($member = null)
-    {
-        return Permission::check('Location_EDIT', 'any', $member);
-    }
+	/**
+	 * @param null|Member $member
+	 * @return bool|int
+	 */
+	public function canEdit($member = null)
+	{
+		return Permission::check('Location_EDIT', 'any', $member);
+	}
 
-    /**
-     * @param null|Member $member
-     * @return bool|int
-     */
-    public function canDelete($member = null)
-    {
-        return Permission::check('Location_DELETE', 'any', $member);
-    }
+	/**
+	 * @param null|Member $member
+	 * @return bool|int
+	 */
+	public function canDelete($member = null)
+	{
+		return Permission::check('Location_DELETE', 'any', $member);
+	}
 
-    /**
-     * @param null|Member $member
-     * @return bool|int
-     */
-    public function canCreate($member = null)
-    {
-        return Permission::check('Location_CREATE', 'any', $member);
-    }
+	/**
+	 * @param null|Member $member
+	 * @return bool|int
+	 */
+	public function canCreate($member = null)
+	{
+		return Permission::check('Location_CREATE', 'any', $member);
+	}
 
-    /**
-     * @return array
-     */
-    public function providePermissions()
-    {
-        return array(
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        );
-    }
+	/**
+	 * @return array
+	 */
+	public function providePermissions()
+	{
+		return array(
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		);
+	}
 
 }

code/bulkloader/LocationCsvBulkLoader.php

Indentation +42 added lines, -42 removed lines

@@ -6,51 +6,51 @@
 class LocationCsvBulkLoader extends CsvBulkLoader
 {
 
-    /**
-     * @var array
-     */
-    public $columnMap = array(
-        'Name' => 'Title',
-        'City' => 'Suburb',
-        'EmailAddress' => 'Email',
-        'Category' => 'Category.Name',
-        'Import_ID' => 'Import_ID',
-    );
+	/**
+	 * @var array
+	 */
+	public $columnMap = array(
+		'Name' => 'Title',
+		'City' => 'Suburb',
+		'EmailAddress' => 'Email',
+		'Category' => 'Category.Name',
+		'Import_ID' => 'Import_ID',
+	);
 
-    /**
-     * @var array
-     */
-    public $duplicateChecks = array(
-        'Import_ID' => 'Import_ID'
-    );
+	/**
+	 * @var array
+	 */
+	public $duplicateChecks = array(
+		'Import_ID' => 'Import_ID'
+	);
 
-    /**
-     * @var array
-     */
-    public $relationCallbacks = array(
-       'Category.Name' => array(
-           'relationname' => 'Category',
-           'callback' => 'getCategoryByName',
-        ),
-    );
+	/**
+	 * @var array
+	 */
+	public $relationCallbacks = array(
+	   'Category.Name' => array(
+		   'relationname' => 'Category',
+		   'callback' => 'getCategoryByName',
+		),
+	);
 
-    /**
-     * @param $obj
-     * @param $val
-     * @param $record
-     * @return DataObject|static
-     */
-    public static function getCategoryByName(&$obj, $val, $record)
-    {
-        $val = Convert::raw2sql($val);
-        $category = LocationCategory::get()->filter(array('Name' => $val))->First();
-        if (!$category) {
-            $category = LocationCategory::create();
-            $category->Name = $val;
-            $category->write();
-        }
+	/**
+	 * @param $obj
+	 * @param $val
+	 * @param $record
+	 * @return DataObject|static
+	 */
+	public static function getCategoryByName(&$obj, $val, $record)
+	{
+		$val = Convert::raw2sql($val);
+		$category = LocationCategory::get()->filter(array('Name' => $val))->First();
+		if (!$category) {
+			$category = LocationCategory::create();
+			$category->Name = $val;
+			$category->write();
+		}
 
-        return $category;
-    }
+		return $category;
+	}
 
 }

tests/LocationTest.php

Indentation +180 added lines, -180 removed lines

@@ -6,184 +6,184 @@
 class LocationTest extends SapphireTest
 {
 
-    /**
-     * @var string
-     */
-    protected static $fixture_file = 'locator/tests/Locator_Test.yml';
-
-    /**
-     *
-     */
-    public function testGetCoords()
-    {
-        $location = $this->objFromFixture('Location', 'dynamic');
-
-        $coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false';
-
-        $this->assertEquals($coords, $location->getCoords());
-    }
-
-    /**
-     *
-     */
-    public function testFieldLabels()
-    {
-        $location = $this->objFromFixture('Location', 'dynamic');
-        $labels = $location->FieldLabels();
-        $expected = array(
-            'Title' => 'Name',
-            'Featured' => 'Featured',
-            'Website' => 'Website',
-            'Phone' => 'Phone',
-            'Email' => 'Email',
-            'EmailAddress' => 'Email Address',
-            'ShowInLocator' => 'Show',
-            'Address' => 'Address',
-            'Suburb' => 'City',
-            'State' => 'State',
-            'Postcode' => 'Postal Code',
-            'Country' => 'Country',
-            'Lat' => 'Lat',
-            'Lng' => 'Lng',
-            'Category' => 'Category',
-            'ShowInLocator.NiceAsBoolean' => 'Show',
-            'Category.Name' => 'Category',
-            'Category.ID' => 'Category',
-            'Featured.NiceAsBoolean' => 'Featured',
-            'Coords' => 'Coords',
-            'Import_ID' => 'Import_ID',
-        );
-        $this->assertEquals($expected, $labels);
-    }
-
-    /**
-     *
-     */
-    public function testGetCMSFields()
-    {
-        $object = new Location();
-        $fieldset = $object->getCMSFields();
-        $this->assertTrue(is_a($fieldset, 'FieldList'));
-    }
-
-    /**
-     *
-     */
-    public function testValidate()
-    {
-    }
-
-    /**
-     *
-     */
-    public function testEmailAddress()
-    {
-    }
-
-    /**
-     *
-     */
-    public function testCanView()
-    {
-        $object = $this->objFromFixture('Location', 'dynamic');
-        $object->write();
-
-        $this->assertTrue($object->canView());
-
-        $nullMember = Member::create();
-        $nullMember->write();
-
-        $this->assertTrue($object->canView($nullMember));
-
-        $nullMember->delete();
-    }
-
-    /**
-     *
-     */
-    public function testCanEdit()
-    {
-        $object = $this->objFromFixture('Location', 'dynamic');
-        $object->write();
-
-        $objectID = $object->ID;
-
-        //test permissions per permission setting
-        $create = $this->objFromFixture('Member', 'locationcreate');
-        $edit = $this->objFromFixture('Member', 'locationedit');
-        $delete = $this->objFromFixture('Member', 'locationdelete');
-
-        $originalTitle = $object->Title;
-        $this->assertEquals($originalTitle, 'Dynamic, Inc.');
-
-        $this->assertTrue($object->canEdit($edit));
-        $this->assertFalse($object->canEdit($create));
-        $this->assertFalse($object->canEdit($delete));
-
-        $object->Title = 'Changed Title';
-        $object->write();
-
-        $testEdit = Location::get()->byID($objectID);
-        $this->assertEquals($testEdit->Title, 'Changed Title');
-    }
-
-    /**
-     *
-     */
-    public function testCanDelete()
-    {
-        $object = $this->objFromFixture('Location', 'dynamic');
-        $object->write();
-
-        //test permissions per permission setting
-        $create = $this->objFromFixture('Member', 'locationcreate');
-        $edit = $this->objFromFixture('Member', 'locationedit');
-        $delete = $this->objFromFixture('Member', 'locationdelete');
-
-        $this->assertTrue($object->canDelete($delete));
-        $this->assertFalse($object->canDelete($create));
-        $this->assertFalse($object->canDelete($edit));
-
-        $checkObject = $object;
-        $object->delete();
-
-        $this->assertEquals($checkObject->ID, 0);
-    }
-
-    /**
-     *
-     */
-    public function testCanCreate()
-    {
-        $object = singleton('Location');
-
-        //test permissions per permission setting
-        $create = $this->objFromFixture('Member', 'locationcreate');
-        $edit = $this->objFromFixture('Member', 'locationedit');
-        $delete = $this->objFromFixture('Member', 'locationdelete');
-
-        $this->assertTrue($object->canCreate($create));
-        $this->assertFalse($object->canCreate($edit));
-        $this->assertFalse($object->canCreate($delete));
-
-        $nullMember = Member::create();
-        $nullMember->write();
-        $this->assertFalse($object->canCreate($nullMember));
-
-        $nullMember->delete();
-    }
-
-    /**
-     *
-     */
-    public function testProvidePermissions()
-    {
-        $object = Location::create();
-        $expected = array(
-            'Location_EDIT' => 'Edit a Location',
-            'Location_DELETE' => 'Delete a Location',
-            'Location_CREATE' => 'Create a Location',
-        );
-        $this->assertEquals($expected, $object->providePermissions());
-    }
+	/**
+	 * @var string
+	 */
+	protected static $fixture_file = 'locator/tests/Locator_Test.yml';
+
+	/**
+	 *
+	 */
+	public function testGetCoords()
+	{
+		$location = $this->objFromFixture('Location', 'dynamic');
+
+		$coords = ((int)$location->Lat != 0 && (int)$location->Lng != 0) ? 'true' : 'false';
+
+		$this->assertEquals($coords, $location->getCoords());
+	}
+
+	/**
+	 *
+	 */
+	public function testFieldLabels()
+	{
+		$location = $this->objFromFixture('Location', 'dynamic');
+		$labels = $location->FieldLabels();
+		$expected = array(
+			'Title' => 'Name',
+			'Featured' => 'Featured',
+			'Website' => 'Website',
+			'Phone' => 'Phone',
+			'Email' => 'Email',
+			'EmailAddress' => 'Email Address',
+			'ShowInLocator' => 'Show',
+			'Address' => 'Address',
+			'Suburb' => 'City',
+			'State' => 'State',
+			'Postcode' => 'Postal Code',
+			'Country' => 'Country',
+			'Lat' => 'Lat',
+			'Lng' => 'Lng',
+			'Category' => 'Category',
+			'ShowInLocator.NiceAsBoolean' => 'Show',
+			'Category.Name' => 'Category',
+			'Category.ID' => 'Category',
+			'Featured.NiceAsBoolean' => 'Featured',
+			'Coords' => 'Coords',
+			'Import_ID' => 'Import_ID',
+		);
+		$this->assertEquals($expected, $labels);
+	}
+
+	/**
+	 *
+	 */
+	public function testGetCMSFields()
+	{
+		$object = new Location();
+		$fieldset = $object->getCMSFields();
+		$this->assertTrue(is_a($fieldset, 'FieldList'));
+	}
+
+	/**
+	 *
+	 */
+	public function testValidate()
+	{
+	}
+
+	/**
+	 *
+	 */
+	public function testEmailAddress()
+	{
+	}
+
+	/**
+	 *
+	 */
+	public function testCanView()
+	{
+		$object = $this->objFromFixture('Location', 'dynamic');
+		$object->write();
+
+		$this->assertTrue($object->canView());
+
+		$nullMember = Member::create();
+		$nullMember->write();
+
+		$this->assertTrue($object->canView($nullMember));
+
+		$nullMember->delete();
+	}
+
+	/**
+	 *
+	 */
+	public function testCanEdit()
+	{
+		$object = $this->objFromFixture('Location', 'dynamic');
+		$object->write();
+
+		$objectID = $object->ID;
+
+		//test permissions per permission setting
+		$create = $this->objFromFixture('Member', 'locationcreate');
+		$edit = $this->objFromFixture('Member', 'locationedit');
+		$delete = $this->objFromFixture('Member', 'locationdelete');
+
+		$originalTitle = $object->Title;
+		$this->assertEquals($originalTitle, 'Dynamic, Inc.');
+
+		$this->assertTrue($object->canEdit($edit));
+		$this->assertFalse($object->canEdit($create));
+		$this->assertFalse($object->canEdit($delete));
+
+		$object->Title = 'Changed Title';
+		$object->write();
+
+		$testEdit = Location::get()->byID($objectID);
+		$this->assertEquals($testEdit->Title, 'Changed Title');
+	}
+
+	/**
+	 *
+	 */
+	public function testCanDelete()
+	{
+		$object = $this->objFromFixture('Location', 'dynamic');
+		$object->write();
+
+		//test permissions per permission setting
+		$create = $this->objFromFixture('Member', 'locationcreate');
+		$edit = $this->objFromFixture('Member', 'locationedit');
+		$delete = $this->objFromFixture('Member', 'locationdelete');
+
+		$this->assertTrue($object->canDelete($delete));
+		$this->assertFalse($object->canDelete($create));
+		$this->assertFalse($object->canDelete($edit));
+
+		$checkObject = $object;
+		$object->delete();
+
+		$this->assertEquals($checkObject->ID, 0);
+	}
+
+	/**
+	 *
+	 */
+	public function testCanCreate()
+	{
+		$object = singleton('Location');
+
+		//test permissions per permission setting
+		$create = $this->objFromFixture('Member', 'locationcreate');
+		$edit = $this->objFromFixture('Member', 'locationedit');
+		$delete = $this->objFromFixture('Member', 'locationdelete');
+
+		$this->assertTrue($object->canCreate($create));
+		$this->assertFalse($object->canCreate($edit));
+		$this->assertFalse($object->canCreate($delete));
+
+		$nullMember = Member::create();
+		$nullMember->write();
+		$this->assertFalse($object->canCreate($nullMember));
+
+		$nullMember->delete();
+	}
+
+	/**
+	 *
+	 */
+	public function testProvidePermissions()
+	{
+		$object = Location::create();
+		$expected = array(
+			'Location_EDIT' => 'Edit a Location',
+			'Location_DELETE' => 'Delete a Location',
+			'Location_CREATE' => 'Create a Location',
+		);
+		$this->assertEquals($expected, $object->providePermissions());
+	}
 }