- AuditTrail Berechtigungen gesetzt (Nur Admin)

- Fehler in Extension "CJuiDateTimePicker" beseitigt
- DateCompareValidator hinzugefügt
- DateRangeValidator hinzugefügt
- Datenbanktabellennamen geändert
- Views für die Veranstaltungen bearbeitet

8 files changed, 16 insertions, 14 deletions

diff --git a/protected/views/layouts/main.php b/protected/views/layouts/main.php
index 85ee278..1e499bc 100644
--- a/protected/views/layouts/main.php
+++ b/protected/views/layouts/main.php
@@ -41,6 +41,8 @@
 						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->vereinId, "active"=>$this->id == "myAngebot"),
 				array("label"=>"Veranstaltungen", "url"=>array("/veranstaltung/index"),
 						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "veranstaltung"),
+				array("label"=>"Audit", "url"=>array("/auditTrail/admin"),
+						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "admin"),
 				array("label"=>"Benutzer", "url"=>array("/user/admin"),
 						"visible"=>!Yii::app()->user->isGuest && Yii::app()->user->isAdmin, "active"=>$this->id == "user"),
 				array('label'=>'Logout ('.Yii::app()->user->name.')', 'url'=>array('/site/logout'),
diff --git a/protected/views/myverein/view.php b/protected/views/myverein/view.php
index 5e7649c..52afea7 100644
--- a/protected/views/myverein/view.php
+++ b/protected/views/myverein/view.php
@@ -20,6 +20,6 @@ $this->menu=array(
 		'email',
 		'kontaktdaten:html',
 		'beschreibung:html',
-		array('label'=>'Standort', 'value'=>$model->standort->name)
+		array('label'=>'Standort', 'value'=>($model->standort) ? $model->standort->name : "-")
 	),
 )); ?>
diff --git a/protected/views/veranstaltung/_form.php b/protected/views/veranstaltung/_form.php
index 10eb6c9..833c693 100644
--- a/protected/views/veranstaltung/_form.php
+++ b/protected/views/veranstaltung/_form.php
@@ -30,8 +30,8 @@
 				'mode'=>'datetime',
 				// additional javascript options for the date picker plugin
 				'options'=>array(
-						'minDate'=>Yii::app()->params["start_datetime"],
-						'maxDate'=>Yii::app()->params["end_datetime"]
+						'minDate'=>Yii::app()->params["start_date"],
+						'maxDate'=>Yii::app()->params["end_date"],
 				),
 				'htmlOptions'=>array(
 						'style'=>'height:20px;'
@@ -50,8 +50,8 @@
 				'mode'=>'datetime',
 				// additional javascript options for the date picker plugin
 				'options'=>array(
-						'minDate'=>Yii::app()->params["start_datetime"],
-						'maxDate'=>Yii::app()->params["end_datetime"]
+						'minDate'=>Yii::app()->params["start_date"],
+						'maxDate'=>Yii::app()->params["end_date"],
 				),
 				'htmlOptions'=>array(
 						'style'=>'height:20px;'
diff --git a/protected/views/veranstaltung/index.php b/protected/views/veranstaltung/index.php
index f058e2e..42d1d62 100644
--- a/protected/views/veranstaltung/index.php
+++ b/protected/views/veranstaltung/index.php
@@ -23,8 +23,8 @@ $this->menu=array(
 		'id',
 		array('header'=>'Verein', 'value'=>'$data->verein->name'),
 		'titel',
-		'startzeit',
-		'endzeit',
+		array('header'=>'Startzeit', 'value'=>Format::displayDateTime($model->startzeit)),
+		array('header'=>'Endzeit', 'value'=>Format::displayDateTime($model->endzeit)),
 		array('header'=>'Standort', 'value'=>'($data->standort) ? $data->standort->name : "Kein Standort"'),
 		array('header'=>'Öffentlich',
 				'value'=>'CHtml::image($data->published ? "images/ok.png" : "images/nok.png", $data->published ? "ok.png" : "nok.png")', 'type'=>'raw'),
diff --git a/protected/views/veranstaltung/view.php b/protected/views/veranstaltung/view.php
index aa48d41..5840a4e 100644
--- a/protected/views/veranstaltung/view.php
+++ b/protected/views/veranstaltung/view.php
@@ -17,12 +17,12 @@ $this->menu=array(
 <?php $this->widget('zii.widgets.CDetailView', array(
 	'data'=>$model,
 	'attributes'=>array(
-		array('label'=>'Verein', 'value'=>($model->verein) ? $model->verein->name : "-"),
+		array('label'=>'Verein', 'value'=>($model->verein) ? $model->verein->name : null),
 		'titel',
-		'startzeit',
-		'endzeit',
+		array('label'=>'Startzeit', 'value'=>Format::displayDateTime($model->startzeit)),
+		array('label'=>'Endzeit', 'value'=>Format::displayDateTime($model->endzeit)),
 		'beschreibung:html',
-		array('label'=>'Standort', 'value'=>($model->standort) ? $model->standort->name : "-"),
+		array('label'=>'Standort', 'value'=>($model->standort) ? $model->standort->name : null),
 		array('label'=>'Öfentlich', 'value'=>CHtml::image($model->published ? "images/ok.png" : "images/nok.png", $model->published ? "ok.png" : "nok.png"), 'type'=>'raw'),
 	),
 )); ?>
diff --git a/protected/views/verein/_form.php b/protected/views/verein/_form.php
index 9aab04d..dbda2db 100644
--- a/protected/views/verein/_form.php
+++ b/protected/views/verein/_form.php
@@ -14,7 +14,7 @@
 		<?php echo $form->labelEx($model,'slug'); ?>
 		<?php
 		if (Yii::app()->user->isAdmin) {
-			echo $form->textField($model,'slug',array('size'=>60,'maxlength'=>255));
+			echo $form->dropDownList($model, "slug", CHtml::listData($slugs, "username", "username"), array('empty' => '-- Bitte Benutzer wählen --'));
 		} else {
 			echo CHtml::encode($model->slug);
 		}
diff --git a/protected/views/verein/create.php b/protected/views/verein/create.php
index 02a63f8..46f088e 100644
--- a/protected/views/verein/create.php
+++ b/protected/views/verein/create.php
@@ -11,4 +11,4 @@ $this->menu=array(
 
 <h1>Verein erstellen</h1>
 
-<?php echo $this->renderPartial('_form', array('model'=>$model, 'standorte'=>$standorte)); ?>
\ No newline at end of file
+<?php echo $this->renderPartial('_form', array('model'=>$model, 'standorte'=>$standorte,'slugs'=>$slugs)); ?>
\ No newline at end of file
diff --git a/protected/views/verein/update.php b/protected/views/verein/update.php
index 0d37b80..5230605 100644
--- a/protected/views/verein/update.php
+++ b/protected/views/verein/update.php
@@ -13,4 +13,4 @@ $this->menu=array(
 
 <h1>Verein '<?php echo $model->name; ?>' bearbeiten</h1>
 
-<?php echo $this->renderPartial('_form', array('model'=>$model, 'standorte'=>$standorte)); ?>
\ No newline at end of file
+<?php echo $this->renderPartial('_form', array('model'=>$model, 'standorte'=>$standorte,'slugs'=>$slugs)); ?>
\ No newline at end of file