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

Merge pull request #1 from snipe/2.0

Browse Source 
2.0
This commit is contained in:
Michael Daniels
2015-07-29 14:21:57 -04:00
parent e4ad1011da 480fd78c51
commit 85a9f1b71f
8 changed files with 108 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/LocationsController.php
+8 -4
View File
@@ -99,11 +99,11 @@ class LocationsController extends AdminController
return Redirect::to('admin/settings/locations/create')->with('error', Lang::get('admin/locations/message.create.error'));
}
public function store()
{
$new = Input::all();
$new['currency']=Setting::first()->default_currency;
// create a new location instance
@@ -237,10 +237,14 @@ class LocationsController extends AdminController
}
if ($location->has_users->count() > 0) {
if ($location->users->count() > 0) {
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'));
return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_child_loc'));
} elseif ($location->assets->count() > 0) {
return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_assets'));
} elseif ($location->assignedassets->count() > 0) {
return Redirect::to('admin/settings/locations')->with('error', Lang::get('admin/locations/message.assoc_assets'));
} else {
$location->delete();
return Redirect::to('admin/settings/locations')->with('success', Lang::get('admin/locations/message.delete.success'));
app/lang/en/admin/locations/message.php
+2
View File
@@ -4,6 +4,8 @@ return array(
'does_not_exist' => 'Location does not exist.',
'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
'create' => array(
app/models/Location.php
+3 -3
View File
@@ -16,7 +16,7 @@ class Location extends Elegant
'zip' => 'alpha_space|min:3|max:10',
);
public function has_users() {
public function users() {
return $this->hasMany('User', 'location_id');
}
@@ -33,7 +33,7 @@ class Location extends Elegant
}
public function childLocations() {
return $this->hasMany('Location')->where('parent_id','=',$this->id);
return $this->hasMany('Location','parent_id');
}
public static function getLocationHierarchy($locations, $parent_id = null) {
@@ -64,7 +64,7 @@ class Location extends Elegant
public static function flattenLocationsArray ($location_options_array = null) {
$location_options = array();
foreach ($location_options_array as $id => $value) {
// get the top level key value
app/routes.php
+3 -1
View File
@@ -61,6 +61,7 @@ Route::group(array('prefix' => 'api', 'namespace' => 'Controllers\Admin', 'befor
/*---Models API---*/
Route::group( [ 'prefix' => 'models'], function() {
Route::resource('/','ModelsController');
Route::get('list/{status?}', array('as'=>'api.models.list', 'uses'=>'ModelsController@getDatatable'));
Route::get('{modelId}/check', function ($modelId) {
$model = Model::find($modelId);
@@ -75,6 +76,7 @@ Route::group(array('prefix' => 'api', 'namespace' => 'Controllers\Admin', 'befor
Route::get('list', ['as'=>'api.categories.list', 'uses'=>'CategoriesController@getDatatable']);
Route::get('{categoryID}/view', ['as'=>'api.categories.view', 'uses'=>'CategoriesController@getDataView']);
});
/*-- Suppliers API (mostly for creating new ones in-line while creating an asset) --*/
Route::group(['prefix'=>'suppliers'], function () {
Route::resource('/', 'SuppliersController');
@@ -443,7 +445,7 @@ Route::group(array('prefix' => 'auth'), function () {
[ 'as' => 'account/accept-assets', 'uses' => 'ViewAssetsController@getAcceptAsset' ] );
Route::post( 'accept-asset/{logID}',
[ 'as' => 'account/asset-accepted', 'uses' => 'ViewAssetsController@postAcceptAsset' ] );
# Profile
Route::get( 'requestable-assets',
app/views/backend/accessories/view.blade.php
+1 -1
View File
@@ -15,7 +15,7 @@
<div class="row header">
<div class="col-md-12">
<div class="btn-group pull-right">
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="fa fa-arrow-left icon-white"></i> @lang('general.back')</a> </div>
<a href="{{ URL::to('admin/accessories') }}" class="btn-flat gray pull-right"><i class="fa fa-arrow-left icon-white"></i> @lang('general.back')</a> </div>
<h3>
{{{ $accessory->name }}}
@lang('general.accessory')
app/views/backend/hardware/edit.blade.php
+68 -72
View File
@@ -18,64 +18,56 @@
<h4 class="modal-title">Modal title</h4>
</div>
<div class="modal-body">
<label for="modal-name" class="dynamic-form-element">Name:
<input type='text' id='modal-name' class="form-control">
<br>
</label>
<div class="dynamic-form-row">
<div class="col-md-3 col-xs-12"><label for="modal-name">@lang('general.name'):</label></div>
<div class="col-md-9 col-xs-12"><input type='text' id='modal-name' class="form-control"></div>
</div>
<div class="dynamic-form-row">
<div class="col-md-3 col-xs-12"><label for="modal-manufacturer_id">@lang('general.manufacturer'):</label></div>
<div class="col-md-9 col-xs-12">{{ Form::select('modal-manufacturer', $manufacturer , '', array('class'=>'select2 parent', 'style'=>'width:350px','id' =>'modal-manufacturer_id')) }}</div>
</div>
<label for="modal-manufacturer_id" class="dynamic-form-element">Manufacturer:
{{ Form::select('modal-manufacturer', $manufacturer , '', array('class'=>'select2 parent', 'style'=>'width:350px','id' =>'modal-manufacturer_id')) }}
<br>
</label>
<label for="modal-category_id" class="dynamic-form-element">Category:
{{ Form::select('modal-category', $category ,'', array('class'=>'select2 parent', 'style'=>'width:350px','id' => 'modal-category_id')) }}
<br>
</label>
<label for="modal-city" class="dynamic-form-element">City:
<input type='text' id='modal-city' class="form-control">
<br>
</label>
<label for="modal-country" class="dynamic-form-element">Country:
{{ Form::countries('country', Input::old('country'), 'select2 country',"modal-country") }}
<br>
</label>
<label for="modal-first_name" class="dynamic-form-element">First Name:
<input type='text' id='modal-first_name' class="form-control">
<br>
</label>
<label for="modal-last_name" class="dynamic-form-element">Last Name:
<input type='text' id='modal-last_name' class="form-control">
<br>
</label>
<div class="dynamic-form-row">
<div class="col-md-3 col-xs-12"><label for="modal-category_id">@lang('general.category'):</label></div>
<div class="col-md-9 col-xs-12">{{ Form::select('modal-category', $category ,'', array('class'=>'select2 parent', 'style'=>'width:350px','id' => 'modal-category_id')) }}</div>
</div>
<div class="dynamic-form-row">
<div class="col-md-3 col-xs-12"><label for="modal-city">@lang('general.city'):</label></div>
<div class="col-md-9 col-xs-12"><input type='text' id='modal-city' class="form-control"></div>
</div>
<div class="dynamic-form-row">
<div class="col-md-3 col-xs-12"><label for="modal-country">@lang('general.country'):</label></div>
<div class="col-md-9 col-xs-12">{{ Form::countries('country', Input::old('country'), 'select2 country',"modal-country") }}</div>
</div>
<div class="dynamic-form-row">
<div class="col-md-3 col-xs-12"><label for="modal-first_name">@lang('general.first_name'):</label></div>
<div class="col-md-9 col-xs-12"><input type='text' id='modal-first_name' class="form-control"></div>
</div>
<div class="dynamic-form-row">
<div class="col-md-3 col-xs-12"><label for="modal-last_name">@lang('general.last_name'):</label></div>
<div class="col-md-9 col-xs-12"><input type='text' id='modal-last_name' class="form-control"></div>
</div>
<div class="dynamic-form-row">
<div class="col-md-3 col-xs-12"><label for="modal-username">@lang('admin/users/table.username'):</label></div>
<div class="col-md-9 col-xs-12"><input type='text' id='modal-username' class="form-control"></div>
</div>
<div class="dynamic-form-row">
<div class="col-md-3 col-xs-12"><label for="modal-password">@lang('admin/users/table.password'):</label></div>
<div class="col-md-9 col-xs-12"><input type='password' id='modal-password' class="form-control"></div>
</div>
<div class="dynamic-form-row">
<div class="col-md-3 col-xs-12"><label for="modal-password_confirm">@lang('admin/users/table.password_confirm'):</label></div>
<div class="col-md-9 col-xs-12"><input type='password' id='modal-password_confirm' class="form-control"></div>
</div>
<label for="modal-username" class="dynamic-form-element">Username:
<input type='text' id='modal-username' class="form-control">
<br>
</label>
<label for="modal-password" class="dynamic-form-element">Password:
<input type='password' id='modal-password' class="form-control">
<br>
</label>
<label for="modal-password_confirm" class="dynamic-form-element">Confirm Password:
<input type='password' id='modal-password_confirm' class="form-control">
</label>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -163,7 +155,7 @@
@endif
<span class="mac_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency="model" data-select="model_select_id">Add new Model...</a> <!-- onclick="return dependency('model')" -->
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency="model" data-select="model_select_id"><i class="verticon fa fa-plus-square-o fa-2x"></i></a> <!-- onclick="return dependency('model')" -->
{{ $errors->first('model_id', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') }}
</div>
</div>
@@ -192,7 +184,7 @@
<label for="supplier_id" class="col-md-2 control-label">@lang('admin/hardware/form.supplier')</label>
<div class="col-md-7 col-sm-12">
{{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id', $asset->supplier_id), array('class'=>'select2', 'style'=>'min-width:350px','id'=>'supplier_select_id')) }}
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency="supplier" data-select='supplier_select_id'>Add new Supplier...</a>
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency="supplier" data-select='supplier_select_id'><i class="verticon fa fa-plus-square-o fa-2x"></i></a>
{{ $errors->first('supplier_id', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') }}
</div>
</div>
@@ -242,7 +234,7 @@
<label for="status_id" class="col-md-2 control-label">@lang('admin/hardware/form.status') <i class='fa fa-asterisk'></i></label>
<div class="col-md-7 col-sm-12 col-sm-12">
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2 status_id', 'style'=>'width:350px','id'=>'status_select_id')) }}
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency='statuslabel' data-select='status_select_id'>Add new Status...</a>
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency='statuslabel' data-select='status_select_id'><i class="verticon fa fa-plus-square-o fa-2x"></i></a>
<span class="status_spinner" style="padding-left: 10px; color: green; display:none; width: 30px;"><i class="fa fa-spinner fa-spin"></i> </span>
<p class="help-block">@lang('admin/hardware/form.help_checkout')</p>
@@ -257,7 +249,7 @@
</label>
<div class="col-md-7 col-sm-12">
{{ Form::select('assigned_to', $assigned_to , Input::old('assigned_to', $asset->assigned_to), array('class'=>'select2', 'id'=>'assigned_to', 'style'=>'min-width:350px')) }}
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency="user" data-select='assigned_to'>Add new User...</a>
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency="user" data-select='assigned_to'><i class="verticon fa fa-plus-square-o fa-2x"></i></a>
{{ $errors->first('assigned_to', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') }}
</div>
</div>
@@ -277,7 +269,7 @@
<label for="rtd_location_id" class="col-md-2 control-label">@lang('admin/hardware/form.default_location')</label>
<div class="col-md-7 col-sm-12">
{{ Form::select('rtd_location_id', $location_list , Input::old('rtd_location_id', $asset->rtd_location_id), array('class'=>'select2', 'style'=>'width:350px','id'=>'rtd_location_select')) }}
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency='location' data-select='rtd_location_select'>Add new Location...</a>
<a href='#' data-toggle="modal" data-target="#createModal" data-dependency='location' data-select='rtd_location_select'><i class="verticon fa fa-plus-square-o fa-2x"></i></a>
{{ $errors->first('rtd_location_id', '<br><span class="alert-msg"><i class="fa fa-times"></i> :message</span>') }}
</div>
</div>
@@ -376,14 +368,18 @@ $(function () {
// data-dependency="model" data-select="model_select_id"
model=link.data("dependency");
select=link.data("select");
var modal = $(this);
modal.find('.modal-title').text('Add a new ' + model);
//modal.find('.modal-body').text("This is where I should be AJAX'ing in the contents for the new " +model+" that you'are about to add!");
//use a spinner instead?
$('.dynamic-form-element').hide();
//$('.dynamic-form-element').hide();
//$('.modal-body input').parent().parent().hide();
//$('.modal-body select').parent().parent().hide();
$('.dynamic-form-row').hide();
function show_er(selector) {
$(selector).show().parent().show();
//$(selector).show().parent().show();
$(selector).parent().parent().show();
}
show_er('#modal-name');
switch(model) {
@@ -391,7 +387,7 @@ $(function () {
show_er('#modal-manufacturer_id');
show_er('#modal-category_id');
break;
case 'user':
$('.dynamic-form-element').hide(); //we don't want a generic "name"
show_er("#modal-first_name");
@@ -400,20 +396,20 @@ $(function () {
show_er("#modal-password");
show_er("#modal-password_confirm");
break;
case 'location':
show_er('#modal-city');
show_er('#modal-country');
break;
case 'supplier':
case 'status':
//do nothing, they just need 'name'
}
console.warn("The Model is: "+model+" and the select is: "+select);
});
$('#modal-save').on('click',function () {
var data={};
console.warn("We are about to SAVE!!! for model: "+model+" and select ID: "+select);
@@ -428,15 +424,15 @@ $(function () {
var bits=elem.id.split("-");
data[bits[1]]=$(elem).val();
});
console.dir(data);
$.post("{{Config::get('app.url')}}/api/"+model+"s",data,function (result) {
var id=result.id;
var name=result.name || (result.first_name+" "+result.last_name);
$('.modal-body input:visible').val("");
$('#createModal').modal('hide');
console.warn("The select ID thing we're going for is: "+select);
var selector=document.getElementById(select);
selector.options[selector.length]=new Option(name,id);
@@ -447,7 +443,7 @@ $(function () {
msg=result.responseJSON.error.message || result.responseJSON.error;
window.alert("Unable to add new "+model+" - error: "+msg);
});
});
});
</script>
app/views/backend/layouts/default.blade.php
+2 -1
View File
@@ -19,7 +19,7 @@
<!-- bootstrap -->
<link href="{{ asset('assets/css/bootstrap/bootstrap.css') }}" rel="stylesheet" />
<link href="{{ asset('assets/css/bootstrap/bootstrap-overrides.css') }}" type="text/css" rel="stylesheet" />
<!-- global styles -->
<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/compiled/layout.css') }}">
@@ -40,6 +40,7 @@
<link rel="stylesheet" href="{{ asset('assets/css/compiled/dataTables.colVis.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" href="{{ asset('assets/css/compiled/dataTables.tableTools.css') }}" type="text/css" media="screen" />
<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/compiled/print.css') }}" media="print" />
<link href="{{ asset('assets/css/bootstrap/bootstrap-overrides.css') }}" type="text/css" rel="stylesheet" />
<!-- global header javascripts -->
public/assets/css/bootstrap/bootstrap-overrides.css
Vendored
+21 -13
View File
@@ -21,7 +21,7 @@ h1,h2,h3,h4,h5,h6{
}
/* alerts */
.alert [class^="icon-"],
.alert [class^="icon-"],
.alert [class*=" icon-"] {
font-size: 27px;
position: relative;
@@ -31,15 +31,15 @@ h1,h2,h3,h4,h5,h6{
display: inline-block;
color: #f1c359;
}
.alert-success [class^="icon-"],
.alert-success [class^="icon-"],
.alert-success [class*=" icon-"] {
color: #81ad53;
}
.alert-info [class^="icon-"],
.alert-info [class^="icon-"],
.alert-info [class*=" icon-"] {
color: #4993c6;
}
.alert-danger [class^="icon-"],
.alert-danger [class^="icon-"],
.alert-danger [class*=" icon-"] {
color: #d5393e;
}
@@ -60,7 +60,7 @@ textarea {
}
input[type="text"],
input[type="password"],
textarea {
textarea {
font-size: 13px;
-webkit-box-shadow: inset 0 0px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 0px 1px rgba(0, 0, 0, 0.075);
@@ -105,7 +105,7 @@ input[type="password"].inline-input:hover {
input[type="text"]:focus,
input[type="password"]:focus,
textarea:focus{
textarea:focus{
border-color: #A2CEF0;
-webkit-box-shadow: inset 0 0px 1px rgba(0, 0, 0, 0.075), 0 0 4px rgba(82, 168, 236, 0.6);
-moz-box-shadow: inset 0 0px 1px rgba(0, 0, 0, 0.075), 0 0 4px rgba(82, 168, 236, 0.6);
@@ -173,9 +173,9 @@ textarea::-webkit-input-placeholder {
/* PREPEND & APPEND INPUT */
.input-group input,
.input-group input,
.input-group .uneditable-input,
.input-group input,
.input-group input,
.input-group .uneditable-input,
.input-group .uneditable-input {
border: 1px solid #d6e2eb;
}
@@ -240,11 +240,11 @@ textarea::-webkit-input-placeholder {
/* dropdown caret */
.dropdown .caret {
position: relative;
top: -1px;
top: -1px;
}
/* dropdown active */
.dropdown.open > a,
.dropdown.open > a:hover,
.dropdown.open > a,
.dropdown.open > a:hover,
.dropdown.open > a:focus {
border-color: #101417;
}
@@ -273,7 +273,7 @@ textarea::-webkit-input-placeholder {
border-bottom-color: #333e4a;
border-right-color: #566676;
border-left-color: #566676;
}
}
.pagination.inverse a:hover,
.pagination.inverse span:hover {
background-color: #000;
@@ -344,4 +344,12 @@ table th span.line{
}
}
.verticon {
font-size:30px;
vertical-align: middle;
padding-left: 5px;
}
.dynamic-form-row {
padding-bottom: 50px;
}