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

Merge branch 'refs/heads/develop'

Browse Source
This commit is contained in:
snipe
2013-11-27 12:26:15 -05:00
parent 0aa3c676c2 6552401fd8
commit e79d27c984
16 changed files with 71 additions and 21 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/controllers/admin/ModelsController.php
+17 -7
View File
@@ -9,6 +9,7 @@ use Setting;
use Sentry;
use DB;
use Depreciation;
use Manufacturer;
use Str;
use Validator;
use View;
@@ -38,8 +39,14 @@ class ModelsController extends AdminController {
{
// Show the page
$depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
$manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
$category_list = array('' => '') + DB::table('categories')->lists('name', 'id');
return View::make('backend/models/edit')->with('category_list',$category_list)->with('depreciation_list',$depreciation_list)->with('model',new Model);
$view = View::make('backend/models/edit');
$view->with('category_list',$category_list);
$view->with('depreciation_list',$depreciation_list);
$view->with('manufacturer_list',$manufacturer_list);
$view->with('model',new Model);
return $view;
}
@@ -65,6 +72,7 @@ class ModelsController extends AdminController {
$model->name = e(Input::get('name'));
$model->modelno = e(Input::get('modelno'));
$model->depreciation_id = e(Input::get('depreciation_id'));
$model->manufacturer_id = e(Input::get('manufacturer_id'));
$model->category_id = e(Input::get('category_id'));
$model->user_id = Sentry::getId();
@@ -99,13 +107,18 @@ class ModelsController extends AdminController {
// Check if the model exists
if (is_null($model = Model::find($modelId)))
{
// Redirect to the blogs management page
// Redirect to the model management page
return Redirect::to('assets/models')->with('error', Lang::get('admin/models/message.does_not_exist'));
}
$depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
$manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
$category_list = array('' => '') + DB::table('categories')->lists('name', 'id');
return View::make('backend/models/edit', compact('model'))->with('category_list',$category_list)->with('depreciation_list',$depreciation_list);
$view = View::make('backend/models/edit', compact('model'));
$view->with('category_list',$category_list);
$view->with('depreciation_list',$depreciation_list);
$view->with('manufacturer_list',$manufacturer_list);
return $view;
}
@@ -135,6 +148,7 @@ class ModelsController extends AdminController {
$model->name = e(Input::get('name'));
$model->modelno = e(Input::get('modelno'));
$model->depreciation_id = e(Input::get('depreciation_id'));
$model->manufacturer_id = e(Input::get('manufacturer_id'));
$model->category_id = e(Input::get('category_id'));
@@ -183,9 +197,6 @@ class ModelsController extends AdminController {
// Redirect to the models management page
return Redirect::to('assets/models')->with('success', Lang::get('admin/models/message.delete.success'));
}
}
@@ -213,5 +224,4 @@ class ModelsController extends AdminController {
}
}
app/models/Asset.php
+4
View File
@@ -145,5 +145,9 @@ class Asset extends Elegant {
return $this->belongsTo('Depreciation','id');
}
public function model()
{
return $this->belongsTo('Model','model_id');
}
}
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/validators.php
+1 -1
View File
@@ -2,5 +2,5 @@
Validator::extend('alpha_space', function($attribute,$value,$parameters)
{
return preg_match("/^[-_,!. a-zA-Z0-9]+$/",$value);
return preg_match("/^[-+_,!. a-zA-Z0-9]+$/",$value);
});
app/views/backend/assets/view.blade.php
+8
View File
@@ -105,6 +105,14 @@ View Asset {{ $asset->asset_tag }} ::
<h6><br>More Info:</h6>
<ul>
@if ($asset->model->manufacturer)
<li>Manufacturer: {{ $asset->model->manufacturer->name }} </li>
<li>Model: {{ $asset->model->name }} / {{ $asset->model->modelno }}</li>
@endif
@if ($asset->purchase_date)
<li>Purchased On: {{ $asset->purchase_date }} </li>
@endif
@if ($asset->purchase_date)
<li>Purchased On: {{ $asset->purchase_date }} </li>
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">
app/views/backend/locations/index.blade.php
+2 -2
View File
@@ -22,8 +22,8 @@ Locations ::
<table id="example">
<thead>
<tr role="row">
<th class="span4">@lang('admin/locations/table.name')</th>
<th class="span2">Address</th>
<th class="span3">@lang('admin/locations/table.name')</th>
<th class="span3">Address</th>
<th class="span2">@lang('admin/locations/table.city'),
@lang('admin/locations/table.state')
@lang('admin/locations/table.country')</th>
app/views/backend/models/edit.blade.php
+8
View File
@@ -50,6 +50,14 @@
</div>
</div>
<!-- Manufacturer -->
<div class="control-group {{ $errors->has('manufacturer_id') ? 'error' : '' }}">
<label class="control-label" for="parent">Manufacturer</label>
<div class="controls">
{{ Form::select('manufacturer_id', $manufacturer_list , Input::old('manufacturer_id', $model->manufacturer_id), array('class'=>'select2', 'style'=>'width:250px')) }}
{{ $errors->first('manufacturer_id', '<span class="help-inline">:message</span>') }}
</div>
</div>
<!-- Depreciation -->
<div class="control-group {{ $errors->has('depreciation_id') ? 'error' : '' }}">
app/views/backend/users/create.blade.php
+1 -1
View File
@@ -83,7 +83,7 @@ Create a User ::
<div class="control-group {{ $errors->has('email') ? 'error' : '' }}">
<label class="control-label" for="email">Email</label>
<div class="controls">
<input type="text" name="email" id="email" value="{{ Input::old('email') }}" />
<input type="email" name="email" id="email" value="{{ Input::old('email') }}" />
{{ $errors->first('email', '<span class="help-inline">:message</span>') }}
</div>
</div>
app/views/backend/users/edit.blade.php
+1 -1
View File
@@ -84,7 +84,7 @@ Update User {{ $user->fullName() }} ::
<div class="control-group {{ $errors->has('email') ? 'error' : '' }}">
<label class="control-label" for="email">Email</label>
<div class="controls">
<input type="text" name="email" id="email" value="{{ Input::old('email', $user->email) }}" />
<input type="email" name="email" id="email" value="{{ Input::old('email', $user->email) }}" />
{{ $errors->first('email', '<span class="help-inline">:message</span>') }}
</div>
</div>
app/views/frontend/account/change-email.blade.php
+2 -2
View File
@@ -22,7 +22,7 @@ Change your Email
<div class="control-group{{ $errors->first('email', ' error') }}">
<label class="control-label" for="email">New Email</label>
<div class="controls">
<input type="text" name="email" id="email" value="" />
<input type="email" name="email" id="email" value="" />
{{ $errors->first('email', '<span class="help-block">:message</span>') }}
</div>
</div>
@@ -31,7 +31,7 @@ Change your Email
<div class="control-group{{ $errors->first('email_confirm', ' error') }}">
<label class="control-label" for="email_confirm">Confirm New Email</label>
<div class="controls">
<input type="text" name="email_confirm" id="email_confirm" value="" />
<input type="email" name="email_confirm" id="email_confirm" value="" />
{{ $errors->first('email_confirm', '<span class="help-block">:message</span>') }}
</div>
</div>
app/views/frontend/account/change-password.blade.php
+2 -2
View File
@@ -90,7 +90,7 @@ Change your Password
<div class="control-group{{ $errors->first('email', ' error') }}">
<label class="control-label" for="email">New Email</label>
<div class="controls">
<input type="text" name="email" id="email" value="" />
<input type="email" name="email" id="email" value="" />
{{ $errors->first('email', '<span class="help-block">:message</span>') }}
</div>
</div>
@@ -99,7 +99,7 @@ Change your Password
<div class="control-group{{ $errors->first('email_confirm', ' error') }}">
<label class="control-label" for="email_confirm">Confirm New Email</label>
<div class="controls">
<input type="text" name="email_confirm" id="email_confirm" value="" />
<input type="email" name="email_confirm" id="email_confirm" value="" />
{{ $errors->first('email_confirm', '<span class="help-block">:message</span>') }}
</div>
</div>
app/views/frontend/auth/forgot-password.blade.php
+1 -1
View File
@@ -19,7 +19,7 @@ Forgot Password ::
<div class="control-group{{ $errors->first('email', ' error') }}">
<label class="control-label" for="email">Email</label>
<div class="controls">
<input type="text" name="email" id="email" value="{{ Input::old('email') }}" />
<input type="email" name="email" id="email" value="{{ Input::old('email') }}" />
{{ $errors->first('email', '<span class="help-block">:message</span>') }}
</div>
</div>
app/views/frontend/auth/signin.blade.php
+1 -1
View File
@@ -20,7 +20,7 @@ Account Sign in ::
<div class="control-group{{ $errors->first('email', ' error') }}">
<label class="control-label" for="email">Email</label>
<div class="controls">
<input type="text" name="email" id="email" value="{{ Input::old('email') }}" />
<input type="email" name="email" id="email" value="{{ Input::old('email') }}" />
{{ $errors->first('email', '<span class="help-block">:message</span>') }}
</div>
</div>
app/views/frontend/auth/signup.blade.php
+2 -2
View File
@@ -38,7 +38,7 @@ Account Sign up ::
<div class="control-group{{ $errors->first('email', ' error') }}">
<label class="control-label" for="email">Email</label>
<div class="controls">
<input type="text" name="email" id="email" value="{{ Input::old('email') }}" />
<input type="email" name="email" id="email" value="{{ Input::old('email') }}" />
{{ $errors->first('email', '<span class="help-block">:message</span>') }}
</div>
</div>
@@ -47,7 +47,7 @@ Account Sign up ::
<div class="control-group{{ $errors->first('email_confirm', ' error') }}">
<label class="control-label" for="email_confirm">Confirm Email</label>
<div class="controls">
<input type="text" name="email_confirm" id="email_confirm" value="{{ Input::old('email_confirm') }}" />
<input type="email" name="email_confirm" id="email_confirm" value="{{ Input::old('email_confirm') }}" />
{{ $errors->first('email_confirm', '<span class="help-block">:message</span>') }}
</div>
</div>