From 04a696522d9c389e8f21d593c8ddd396114c8263 Mon Sep 17 00:00:00 2001
From: NikhitaPaturu <nikhitapaturu9@gmail.com>
Date: Thu, 26 Apr 2018 12:21:47 +0100
Subject: [PATCH] made changes to user while creating hosts

---
 app/controller/usercontroller.ctrl.php | 7 +++++--
 app/view/host/index.php                | 2 +-
 app/view/user/create.php               | 9 ++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/controller/usercontroller.ctrl.php b/app/controller/usercontroller.ctrl.php
index 0773dcae..0d7d03c4 100644
--- a/app/controller/usercontroller.ctrl.php
+++ b/app/controller/usercontroller.ctrl.php
@@ -377,9 +377,12 @@ public function create() {
                             $error['role'] = 'Please select a role for the User.';
                         }
 
-                        if(empty($group)){
-                            $group = NULL;
+                         if((empty($groups)) && ($role == '3'))
+                        {                        
+                            $groups = NULL;
+                            $error['group'] = 'Please select a group for the User.';                            
                         }
+
                         if(!$this->User->checkEmail($email)){
                             $error['email'] = 'This email is already in use in our database. Please use another one.';
                         }
diff --git a/app/view/host/index.php b/app/view/host/index.php
index e92819af..83e4d877 100644
--- a/app/view/host/index.php
+++ b/app/view/host/index.php
@@ -32,7 +32,7 @@
                         <li class="group-list clearfix">
                             <div class="pull-left">
                                 <?php if(!empty($g->path)) { ?>
-                                <img src="/uploads/thumbnail_<?php echo $g->path; ?>" width="40" height="40" alt="<?php echo $g->name; ?> Image" class="profile-pic" />
+                                <img src="/uploads/thumbnail_<?php echo $g->path; ?>" width="60" height="60" alt="<?php echo $g->name; ?> Image" class="profile-pic" />
                                 <?php } else { ?>
                                 <img src="/uploads/mid_1474993329ef38d3a4b9478841cc2346f8e131842fdcfd073b307.jpg" width="40" height="40" alt="<?php echo $group->name; ?> Image" class="profile-pic clearfix"/>
                                 <?php } ?>
diff --git a/app/view/user/create.php b/app/view/user/create.php
index e281d4bb..3d31bcaa 100644
--- a/app/view/user/create.php
+++ b/app/view/user/create.php
@@ -43,7 +43,7 @@
 
                             </div>
                             <div class="col-md-6">
-                              <?php /*
+                               <?php /*
 
                                 <div class="form-group <?php if(isset($error) && isset($error['name']) && !empty($error['name'])) { echo "has-error"; } ?>">
                                     <label for="password">Password:</label>
@@ -56,18 +56,17 @@
                                 </div>
 
                                 */ ?>
-
                                 <div class="form-group <?php if(isset($error) && isset($error['group']) && !empty($error['group'])) { echo "has-error"; } ?>">
                                     <label for="group">Group(s):</label>
+                                    <?php if(isset($error) && isset($error['group']) && !empty($error['group'])) { echo '<span class="help-block text-danger">' . $error['group'] . '</span>'; } ?>
                                         <?php foreach($groups as $group){ ?>
                                         <div class="checkbox">
                                             <label>
                                                 <input value="<?php echo $group->id; ?>" type="checkbox" name="groups[]" id="group-<?php echo $group->id; ?>"> <?php echo $group->name; ?>
                                             </label>
+                                             <?php } ?>
                                         </div>
-
-                                        <?php } ?>
-                                        <?php if(isset($error) && isset($error['group']) && !empty($error['group'])) { echo '<span class="help-block text-danger">' . $error['group'] . '</span>'; } ?>
+                                        
                                 </div>
 
                                 <div class="form-group">