ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #72 from peelman/AddAddressToLocation

Browse Source 
Add address to location form
This commit is contained in:
snipe
2013-11-27 07:27:45 -08:00
parent acd9505597 1314a1ffea
commit e49cb9eb85
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/LocationsController.php
+4
View File
@@ -63,6 +63,8 @@ class LocationsController extends AdminController {
// Save the location data
$location->name = e(Input::get('name'));
$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'));
@@ -139,6 +141,8 @@ class LocationsController extends AdminController {
// Update the location data
$location->name = e(Input::get('name'));
$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'));
app/models/Location.php
+3 -1
View File
@@ -7,10 +7,12 @@ class Location extends Elegant {
protected $table = 'locations';
protected $rules = array(
'name' => 'required|alpha_space|min:3',
'address' => 'required|alpha_space|min:5',
'address2' => 'alpha_space|min:5',
'city' => 'required|alpha_space|min:3',
'state' => 'required|alpha|min:2|max:2',
'country' => 'required|alpha|min:2|max:2',
'zip' => 'alpha_dash|min:5',
'zip' => 'alpha_dash|min:5',
);
public function has_users()
app/views/backend/locations/edit.blade.php
+14
View File
@@ -45,6 +45,20 @@
{{ $errors->first('name', '<span class="help-inline">:message</span>') }}
</div>
</div>
<div class="control-group {{ $errors->has('address') ? 'error' : '' }}">
<label class="control-label" for="address">Street Address 1</label>
<div class="controls">
<input class="span4" type="text" name="address" id="address" value="{{ Input::old('address', $location->address) }}" />
{{ $errors->first('address', '<span class="help-inline">:message</span>') }}
</div>
</div>
<div class="control-group {{ $errors->has('address2') ? 'error' : '' }}">
<label class="control-label" for="address2">Street Address 2</label>
<div class="controls">
<input class="span4" type="text" name="address2" id="address2" value="{{ Input::old('address2', $location->address2) }}" />
{{ $errors->first('address2', '<span class="help-inline">:message</span>') }}
</div>
</div>
<div class="control-group {{ $errors->has('city') ? 'error' : '' }}">
<label class="control-label" for="name">City</label>
<div class="controls">