diff --git a/app/config/version.php b/app/config/version.php index 66f99e9409..3c0eb4927e 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v1.2.7-1', - 'hash_version' => 'v1.2.7-1-gbbdbd53', + 'app_version' => 'v1.2.7-2', + 'hash_version' => 'v1.2.7-2-gc8870dd', ); \ No newline at end of file diff --git a/app/controllers/admin/LocationsController.php b/app/controllers/admin/LocationsController.php index 5109ee16d8..0d68f5c5ad 100755 --- a/app/controllers/admin/LocationsController.php +++ b/app/controllers/admin/LocationsController.php @@ -23,7 +23,7 @@ class LocationsController extends AdminController public function getIndex() { // Grab all the locations - $locations = Location::orderBy('created_at', 'DESC')->get(); + $locations = Location::orderBy('created_at', 'DESC')->with('parent')->get(); // Show the page return View::make('backend/locations/index', compact('locations')); @@ -38,7 +38,7 @@ class LocationsController extends AdminController public function getCreate() { // Show the page - $location_options = array('0' => 'Top Level') + Location::lists('name', 'id'); + $location_options = array('' => '') + Location::lists('name', 'id'); return View::make('backend/locations/edit')->with('location_options',$location_options)->with('location',new Location); } @@ -62,12 +62,13 @@ class LocationsController extends AdminController // Save the location data $location->name = e(Input::get('name')); + $location->parent_id = e(Input::get('parent_id')); $location->address = e(Input::get('address')); $location->address2 = e(Input::get('address2')); $location->city = e(Input::get('city')); $location->state = e(Input::get('state')); $location->country = e(Input::get('country')); - $location->zip = e(Input::get('zip')); + $location->zip = e(Input::get('zip')); $location->user_id = Sentry::getId(); // Was the asset created? @@ -104,7 +105,7 @@ class LocationsController extends AdminController // Show the page //$location_options = array('' => 'Top Level') + Location::lists('name', 'id'); - $location_options = array('' => 'Top Level') + DB::table('locations')->where('id', '!=', $locationId)->lists('name', 'id'); + $location_options = array('' => '') + DB::table('locations')->where('id', '!=', $locationId)->lists('name', 'id'); return View::make('backend/locations/edit', compact('location'))->with('location_options',$location_options); } @@ -128,27 +129,28 @@ class LocationsController extends AdminController if ($validator->fails()) { - // The given data did not pass validation + // The given data did not pass validation return Redirect::back()->withInput()->withErrors($validator->messages()); } // attempt validation else { // Update the location data - $location->name = e(Input::get('name')); + $location->name = e(Input::get('name')); + $location->parent_id = e(Input::get('parent_id')); $location->address = e(Input::get('address')); $location->address2 = e(Input::get('address2')); $location->city = e(Input::get('city')); $location->state = e(Input::get('state')); - $location->country = e(Input::get('country')); - $location->zip = e(Input::get('zip')); + $location->country = e(Input::get('country')); + $location->zip = e(Input::get('zip')); // Was the asset created? if($location->save()) { // Redirect to the saved location page return Redirect::to("admin/settings/locations/")->with('success', Lang::get('admin/locations/message.update.success')); } - } + } // Redirect to the location management page return Redirect::to("admin/settings/locations/$locationId/edit")->with('error', Lang::get('admin/locations/message.update.error')); @@ -171,14 +173,11 @@ class LocationsController extends AdminController if ($location->has_users() > 0) { - - // Redirect to the asset management page + return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users')); + } elseif ($location->childLocations->count() > 0) { return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_users')); } else { - $location->delete(); - - // Redirect to the locations management page return Redirect::to('admin/settings/locations')->with('success', Lang::get('admin/locations/message.delete.success')); } diff --git a/app/database/migrations/2015_05_04_085151_add_parent_id_to_locations_table.php b/app/database/migrations/2015_05_04_085151_add_parent_id_to_locations_table.php new file mode 100644 index 0000000000..6c0ed7f831 --- /dev/null +++ b/app/database/migrations/2015_05_04_085151_add_parent_id_to_locations_table.php @@ -0,0 +1,36 @@ +integer('parent_id')->nullable()->default(NULL); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('locations', function(Blueprint $table) + { + // + $table->dropColumn('parent_id'); + }); + } + +} diff --git a/app/lang/en/admin/locations/table.php b/app/lang/en/admin/locations/table.php index 4c2c86d330..7d1f49c818 100755 --- a/app/lang/en/admin/locations/table.php +++ b/app/lang/en/admin/locations/table.php @@ -2,14 +2,15 @@ return array( - 'id' => 'ID', + 'address' => 'Address', 'city' => 'City', - 'state' => 'State', 'country' => 'Country', 'create' => 'Create Location', - 'update' => 'Update Location', - 'name' => 'Location Name', - 'address' => 'Address', - 'zip' => 'Postal Code', + 'id' => 'ID', 'locations' => 'Locations', + 'name' => 'Location Name', + 'parent' => 'Parent Location', + 'state' => 'State', + 'update' => 'Update Location', + 'zip' => 'Postal Code', ); diff --git a/app/models/Location.php b/app/models/Location.php index d1da1bb24d..4a90eb2063 100755 --- a/app/models/Location.php +++ b/app/models/Location.php @@ -10,13 +10,20 @@ class Location extends Elegant 'city' => 'required|alpha_space|min:3|max:255', 'state' => 'alpha_space|min:2|max:32', 'country' => 'required|alpha_space|min:2|max:2|max:2', - 'address' => 'required|alpha_space|min:5|max:80', + 'address' => 'alpha_space|min:5|max:80', 'address2' => 'alpha_space|min:5|max:80', 'zip' => 'alpha_space|min:3|max:10', ); - public function has_users() - { + public function has_users() { return $this->hasMany('User', 'location_id')->count(); } + + public function parent() { + return $this->belongsTo('Location', 'parent_id'); + } + + public function childLocations() { + return $this->hasMany('Location')->where('parent_id','=',$this->id); + } } diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php index 13d5229555..0d3b46587f 100755 --- a/app/views/backend/locations/edit.blade.php +++ b/app/views/backend/locations/edit.blade.php @@ -46,11 +46,23 @@ {{ $errors->first('name', '
:message') }} + + +
+ +
+
+ {{ Form::select('parent_id', $location_options , Input::old('parent_id', $location->parent_id), array('class'=>'select2', 'style'=>'width:350px')) }}
+ {{ $errors->first('parent_id', '
:message') }} +
+
- +
diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php index 623802e435..bf81b53af7 100755 --- a/app/views/backend/locations/index.blade.php +++ b/app/views/backend/locations/index.blade.php @@ -21,7 +21,8 @@ Locations :: - + + @foreach ($locations as $location) - +
@lang('admin/locations/table.name')@lang('admin/locations/table.name')@lang('admin/locations/table.parent') @lang('admin/locations/table.address') @lang('admin/locations/table.city'), @lang('admin/locations/table.state') @@ -32,7 +33,11 @@ Locations ::
{{{ $location->name }}}{{{ $location->name }}} + @if ($location->parent) + {{{ $location->parent->name }}} + @endif + {{{ $location->address }}} @if($location->address2 != '') , {{{ $location->address2 }}}