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

3 files changed, 8 insertions, 2 deletions

diff --git a/protected/views/standort/_form.php b/protected/views/standort/_form.php
index fb17125..f37dc3d 100644
--- a/protected/views/standort/_form.php
+++ b/protected/views/standort/_form.php
@@ -16,6 +16,12 @@
 	</div>
 
     <div class="row">
+        <?php echo $form->labelEx($model,'type'); ?>
+        <?php echo Html::enumDropDownList($model, 'type'); ?>
+        <?php echo $form->error($model,'type'); ?>
+    </div>
+
+	<div class="row">
 		<?php echo $form->labelEx($model,'pos_lat'); ?>
 		<?php echo $form->textField($model,'pos_lat'); ?>
 		<?php echo $form->error($model,'pos_lat'); ?>
diff --git a/protected/views/standort/_search.php b/protected/views/standort/_search.php
index 4f39bd5..eeab539 100644
--- a/protected/views/standort/_search.php
+++ b/protected/views/standort/_search.php
@@ -27,7 +27,7 @@
 
 	<div class="row">
 		<?php echo $form->label($model,'published'); ?>
-		<?php echo $form->textField($model,'published'); ?>
+		<?php echo $form->checkbox($model,'published'); ?>
 	</div>
 
 	<div class="row buttons">
diff --git a/protected/views/standort/index.php b/protected/views/standort/index.php
index 5449010..9a88a74 100644
--- a/protected/views/standort/index.php
+++ b/protected/views/standort/index.php
@@ -61,7 +61,7 @@ $map->render();
 	'dataProvider'=>$model->search(),
 	'filter'=>$model,
 	'columns'=>array(
-		'id',
+		'type',
 		'name',
 		'pos_lat',
 		'pos_long',