From b4b9a35de33e65b7eb682d9ab0d766391c68c47d Mon Sep 17 00:00:00 2001
From: Andreas Ziegler <github@andreas-ziegler.de>
Date: Tue, 6 Sep 2016 23:14:48 +0200
Subject: [PATCH] chg: remove redundant className attributes

---
 app/Controller/NewsController.php | 1 -
 app/Model/EventDelegation.php     | 8 ++------
 app/Model/EventTag.php            | 8 ++------
 app/Model/News.php                | 6 +-----
 app/Model/ServerTag.php           | 8 ++------
 app/Model/Sighting.php            | 8 ++------
 6 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/app/Controller/NewsController.php b/app/Controller/NewsController.php
index 5ae852c99..5748d23ee 100644
--- a/app/Controller/NewsController.php
+++ b/app/Controller/NewsController.php
@@ -17,7 +17,6 @@ class NewsController extends AppController {
 	);
 
 	public function index() {
-		$this->News->bindModel(array('belongsTo' => array('User' => array('className' => 'User'))));
 		$this->paginate['contain'] = array('User' => array('fields' => array('User.email')));
 		$newsItems = $this->paginate();
 		$this->loadModel('User');
diff --git a/app/Model/EventDelegation.php b/app/Model/EventDelegation.php
index a1945cbbf..355bbaabc 100644
--- a/app/Model/EventDelegation.php
+++ b/app/Model/EventDelegation.php
@@ -19,18 +19,14 @@ class EventDelegation extends AppModel {
 	);
 
 	public $belongsTo = array(
-		'Event' => array(
-			'className' => 'Event',
-		),
+		'Event',
 		'Org' => array(
 			'className' => 'Organisation',
 		),
 		'RequesterOrg' => array(
 			'className' => 'Organisation'
 		),
-		'SharingGroup' => array(
-			'className' => 'SharingGroup'
-		)
+		'SharingGroup'
 	);
 
 	public function attachTagToEvent($event_id, $tag_id) {
diff --git a/app/Model/EventTag.php b/app/Model/EventTag.php
index 901156f73..42ef58139 100644
--- a/app/Model/EventTag.php
+++ b/app/Model/EventTag.php
@@ -19,12 +19,8 @@ class EventTag extends AppModel {
 	);
 
 	public $belongsTo = array(
-		'Event' => array(
-			'className' => 'Event',
-		),
-		'Tag' => array(
-			'className' => 'Tag',
-		),
+		'Event',
+		'Tag'
 	);
 
 	// take an array of tag names to be included and an array with tagnames to be excluded and find all event IDs that fit the criteria
diff --git a/app/Model/News.php b/app/Model/News.php
index bbae216d2..9e1da6cf7 100644
--- a/app/Model/News.php
+++ b/app/Model/News.php
@@ -18,9 +18,5 @@ class News extends AppModel {
 		)
 	);
 
-	public $belongsTo = array(
-		'User' => array(
-			'className' => 'User',
-		)
-	);
+	public $belongsTo = 'User';
 }
diff --git a/app/Model/ServerTag.php b/app/Model/ServerTag.php
index 4a717747c..3a1514ec9 100644
--- a/app/Model/ServerTag.php
+++ b/app/Model/ServerTag.php
@@ -19,12 +19,8 @@ class ServerTag extends AppModel {
 	);
 
 	public $belongsTo = array(
-		'Server' => array(
-			'className' => 'Server',
-		),
-		'Tag' => array(
-			'className' => 'Tag',
-		),
+		'Server',
+		'Tag'
 	);
 
 	public function attachTagToServer($server_id, $tag_id) {
diff --git a/app/Model/Sighting.php b/app/Model/Sighting.php
index 63d2f0506..6fddf167b 100644
--- a/app/Model/Sighting.php
+++ b/app/Model/Sighting.php
@@ -19,12 +19,8 @@ class Sighting extends AppModel {
 	);
 
 	public $belongsTo = array(
-			'Attribute' => array(
-					'className' => 'Attribute',
-			),
-			'Event' => array(
-					'className' => 'Event',
-			),
+			'Attribute',
+			'Event',
 			'Organisation' => array(
 					'className' => 'Organisation',
 					'foreignKey' => 'org_id'