Merge branch 'master' of ssh://proxy.ccwn.org:9044/home/ccwn/git-repos/admin.astaf.de

6 files changed, 250 insertions, 10 deletions

diff --git a/protected/controllers/MyAngebotController.php b/protected/controllers/MyAngebotController.php
new file mode 100644
index 0000000..c53da98
--- /dev/null
+++ b/protected/controllers/MyAngebotController.php
@@ -0,0 +1,73 @@
+<?php
+
+class MyAngebotController extends Controller
+{
+
+	/**
+	 * @return array action filters
+	 */
+	public function filters()
+	{
+		return array(
+			'accessControl', // perform access control for CRUD operations
+		);
+	}
+
+	/**
+	 * Specifies the access control rules.
+	 * This method is used by the 'accessControl' filter.
+	 * @return array access control rules
+	 */
+	public function accessRules()
+	{
+		return array(
+			array('allow', // // allow authenticated user
+				'actions'=>array('create','index','delete','update','view'),
+				'users'=>array('@'),
+			),
+			array('deny',  // deny all users
+				'users'=>array('*'),
+			),
+		);
+	}
+	public function actionIndex()
+	{
+		$model=new AngebotVerein('search');
+		$model->unsetAttributes();  // clear any default values
+		if (isset($_GET['AngebotVerein'])) {
+			$model->attributes = $_GET['AngebotVerein'];
+		}
+		$model->verein_id = Yii::app()->user->vereinId;
+
+		$this->render('index',array(
+			'model'=>$model,
+		));
+	}
+
+	// Uncomment the following methods and override them if needed
+	/*
+	public function filters()
+	{
+		// return the filter configuration for this controller, e.g.:
+		return array(
+			'inlineFilterName',
+			array(
+				'class'=>'path.to.FilterClass',
+				'propertyName'=>'propertyValue',
+			),
+		);
+	}
+
+	public function actions()
+	{
+		// return external action classes, e.g.:
+		return array(
+			'action1'=>'path.to.ActionClass',
+			'action2'=>array(
+				'class'=>'path.to.AnotherActionClass',
+				'propertyName'=>'propertyValue',
+			),
+		);
+	}
+	*/
+}
\ No newline at end of file
diff --git a/protected/controllers/MyvereinController.php b/protected/controllers/MyvereinController.php
index cf241fd..fd7428d 100644
--- a/protected/controllers/MyvereinController.php
+++ b/protected/controllers/MyvereinController.php
@@ -44,7 +44,7 @@ class MyvereinController extends Controller
 	{
 		$id = Yii::app()->user->vereinId;
 		if (!$id && Yii::app()->user->isAdmin) {
-			$this->redirect(array("/verein/admin"));
+			$this->redirect(array("/verein/index"));
 		}
 		$this->render('view',array(
 			'model'=>$this->loadModel($id),
diff --git a/protected/controllers/SiteController.php b/protected/controllers/SiteController.php
index 961a968..2ee57b9 100644
--- a/protected/controllers/SiteController.php
+++ b/protected/controllers/SiteController.php
@@ -28,7 +28,7 @@ class SiteController extends Controller
 	public function actionIndex()
 	{
 		if (!Yii::app()->user->isGuest && Yii::app()->user->isAdmin) {
-			$this->redirect(array("/verein/"));
+			$this->redirect(array("/verein/index"));
 		}
 		$this->redirect(array("/myverein/"));
 	}
diff --git a/protected/controllers/SpeisTrankController.php b/protected/controllers/SpeisTrankController.php
index 6f0931e..1da7883 100644
--- a/protected/controllers/SpeisTrankController.php
+++ b/protected/controllers/SpeisTrankController.php
@@ -26,12 +26,8 @@ class SpeisTrankController extends Controller
 	public function accessRules()
 	{
 		return array(
-			array('allow', // allow authenticated user to perform 'create' and 'update' actions
-				'actions'=>array('update','view'),
-				'users'=>array('@'),
-			),
 			array('allow', // allow admin user to perform 'admin' and 'delete' actions
-				'actions'=>array('create','index','delete'),
+				'actions'=>array('create','index','delete','update','view'),
 				'users'=>array('admin'),
 			),
 			array('deny',  // deny all users
diff --git a/protected/controllers/VeranstaltungController.php b/protected/controllers/VeranstaltungController.php
new file mode 100644
index 0000000..49ec10a
--- /dev/null
+++ b/protected/controllers/VeranstaltungController.php
@@ -0,0 +1,169 @@
+<?php
+
+class VeranstaltungController extends Controller
+{
+	/**
+	 * @var string the default layout for the views. Defaults to '//layouts/column2', meaning
+	 * using two-column layout. See 'protected/views/layouts/column2.php'.
+	 */
+	public $layout='//layouts/column2';
+
+	/**
+	 * @return array action filters
+	 */
+	public function filters()
+	{
+		return array(
+			'accessControl', // perform access control for CRUD operations
+		);
+	}
+
+	/**
+	 * Specifies the access control rules.
+	 * This method is used by the 'accessControl' filter.
+	 * @return array access control rules
+	 */
+	public function accessRules()
+	{
+		return array(
+			array('allow', // allow admin user to perform 'admin' and 'delete' actions
+				'actions'=>array('create','update','index','view','delete'),
+				'users'=>array('admin'),
+			),
+			array('deny',  // deny all users
+				'users'=>array('*'),
+			),
+		);
+	}
+
+	/**
+	 * Displays a particular model.
+	 * @param integer $id the ID of the model to be displayed
+	 */
+	public function actionView($id)
+	{
+		$this->render('view',array(
+			'model'=>$this->loadModel($id),
+		));
+	}
+
+	/**
+	 * Creates a new model.
+	 * If creation is successful, the browser will be redirected to the 'view' page.
+	 */
+	public function actionCreate()
+	{
+		$model=new Veranstaltung;
+
+		// Uncomment the following line if AJAX validation is needed
+		// $this->performAjaxValidation($model);
+
+		if(isset($_POST['Veranstaltung']))
+		{
+			$model->attributes=$_POST['Veranstaltung'];
+			Yii::trace(print_r($model, true), "VERANSTALTUNG");
+			if($model->save())
+				$this->redirect(array('view','id'=>$model->id));
+		}
+		
+		$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Bühne'"));
+		$vereine = Verein::model()->findAll(array("condition"=>"published=1"));
+
+		$this->render('create',array(
+			'model'=>$model,
+			'vereine'=>$vereine,
+			'standorte'=>$standorte
+		));
+	}
+
+	/**
+	 * Updates a particular model.
+	 * If update is successful, the browser will be redirected to the 'view' page.
+	 * @param integer $id the ID of the model to be updated
+	 */
+	public function actionUpdate($id)
+	{
+		$model=$this->loadModel($id);
+
+		// Uncomment the following line if AJAX validation is needed
+		// $this->performAjaxValidation($model);
+
+		if(isset($_POST['Veranstaltung']))
+		{
+			$model->attributes=$_POST['Veranstaltung'];
+			
+			if($model->save())
+				$this->redirect(array('view','id'=>$model->id));
+		}
+		
+		$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Bühne'"));
+		$vereine = Verein::model()->findAll(array("condition"=>"published=1"));
+
+		$this->render('update',array(
+			'model'=>$model,
+			'vereine'=>$vereine,
+			'standorte'=>$standorte
+		));
+	}
+
+	/**
+	 * Deletes a particular model.
+	 * If deletion is successful, the browser will be redirected to the 'admin' page.
+	 * @param integer $id the ID of the model to be deleted
+	 */
+	public function actionDelete($id)
+	{
+		if(Yii::app()->request->isPostRequest)
+		{
+			// we only allow deletion via POST request
+			$this->loadModel($id)->delete();
+
+			// if AJAX request (triggered by deletion via admin grid view), we should not redirect the browser
+			if(!isset($_GET['ajax']))
+				$this->redirect(isset($_POST['returnUrl']) ? $_POST['returnUrl'] : array('admin'));
+		}
+		else
+			throw new CHttpException(400,'Invalid request. Please do not repeat this request again.');
+	}
+
+	/**
+	 * Lists all models.
+	 */
+	public function actionIndex()
+	{
+		$model=new Veranstaltung('search');
+		$model->unsetAttributes();  // clear any default values
+		if(isset($_GET['Veranstaltung']))
+			$model->attributes=$_GET['Veranstaltung'];
+
+		$this->render('index',array(
+			'model'=>$model,
+		));
+	}
+
+	/**
+	 * Returns the data model based on the primary key given in the GET variable.
+	 * If the data model is not found, an HTTP exception will be raised.
+	 * @param integer the ID of the model to be loaded
+	 */
+	public function loadModel($id)
+	{
+		$model=Veranstaltung::model()->findByPk($id);
+		if($model===null)
+			throw new CHttpException(404,'The requested page does not exist.');
+		return $model;
+	}
+
+	/**
+	 * Performs the AJAX validation.
+	 * @param CModel the model to be validated
+	 */
+	protected function performAjaxValidation($model)
+	{
+		if(isset($_POST['ajax']) && $_POST['ajax']==='veranstaltung-form')
+		{
+			echo CActiveForm::validate($model);
+			Yii::app()->end();
+		}
+	}
+}
diff --git a/protected/controllers/VereinController.php b/protected/controllers/VereinController.php
index 30c05bc..aa18245 100644
--- a/protected/controllers/VereinController.php
+++ b/protected/controllers/VereinController.php
@@ -65,7 +65,7 @@ class VereinController extends Controller
 				$this->redirect(array('view','id'=>$model->id));
 		}
 		
-		$standorte = Standort::model()->findAll(array("condition"=>"published=1"));
+		$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Stand'"));
 		$this->render('create',array(
 			'model'=>$model,
 			'standorte'=>$standorte
@@ -91,10 +91,12 @@ class VereinController extends Controller
 				$this->redirect(array('view','id'=>$model->id));
 		}
 
-		$standorte = Standort::model()->findAll(array("condition"=>"published=1"));
+		$standorte = Standort::model()->findAll(array("condition"=>"published=1 and type='Stand'"));
+		$slugs = User::model()->findAll();
 		$this->render('update',array(
 			'model'=>$model,
-			'standorte'=>$standorte
+			'standorte'=>$standorte,
+			'slugs'=>$slugs
 		));
 	}