From b79841d481c5e3c3febddcc2e083614643fa967f Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 28 Jul 2015 11:18:18 -0700 Subject: [PATCH 1/8] Fix for @uberbrady's missing route on inline adding --- app/routes.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/routes.php b/app/routes.php index f5c15445aa..0cc4f62c29 100755 --- a/app/routes.php +++ b/app/routes.php @@ -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', From fe2fb63007fe1b4f1f0aa44739f2b8709758ac54 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 28 Jul 2015 11:31:08 -0700 Subject: [PATCH 2/8] Localization strings for inline modals --- app/views/backend/hardware/edit.blade.php | 76 +++++++++++------------ 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index 07929eb029..653acad3cb 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -18,64 +18,64 @@

Modal title

-
@@ -376,7 +376,7 @@ $(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!"); @@ -391,7 +391,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 +400,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 +428,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 +447,7 @@ $(function () { msg=result.responseJSON.error.message || result.responseJSON.error; window.alert("Unable to add new "+model+" - error: "+msg); }); - + }); }); From 1e38ced8859f99fee26d772fea5285ad21956aab Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 28 Jul 2015 11:58:45 -0700 Subject: [PATCH 3/8] Nicer display of "add new" inline functionality. TODO: Handle validation failures in a less fugly way --- app/views/backend/hardware/edit.blade.php | 10 +++--- app/views/backend/layouts/default.blade.php | 3 +- .../css/bootstrap/bootstrap-overrides.css | 32 +++++++++++-------- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index 653acad3cb..e32c5a8751 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -163,7 +163,7 @@ @endif - Add new Model... + {{ $errors->first('model_id', '
:message') }}
@@ -192,7 +192,7 @@
{{ Form::select('supplier_id', $supplier_list , Input::old('supplier_id', $asset->supplier_id), array('class'=>'select2', 'style'=>'min-width:350px','id'=>'supplier_select_id')) }} - Add new Supplier... + {{ $errors->first('supplier_id', '
:message') }}
@@ -242,7 +242,7 @@
{{ 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')) }} - Add new Status... +

@lang('admin/hardware/form.help_checkout')

@@ -257,7 +257,7 @@
{{ Form::select('assigned_to', $assigned_to , Input::old('assigned_to', $asset->assigned_to), array('class'=>'select2', 'id'=>'assigned_to', 'style'=>'min-width:350px')) }} - Add new User... + {{ $errors->first('assigned_to', '
:message') }}
@@ -277,7 +277,7 @@
{{ 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')) }} - Add new Location... + {{ $errors->first('rtd_location_id', '
:message') }}
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 3f3bdea3a7..5eed5f7f71 100644 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -19,7 +19,7 @@ - + @@ -40,6 +40,7 @@ + diff --git a/public/assets/css/bootstrap/bootstrap-overrides.css b/public/assets/css/bootstrap/bootstrap-overrides.css index b56c31e231..8a906fb557 100644 --- a/public/assets/css/bootstrap/bootstrap-overrides.css +++ b/public/assets/css/bootstrap/bootstrap-overrides.css @@ -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,8 @@ table th span.line{ } } - +.verticon { + font-size:30px; + vertical-align: middle; + padding-left: 5px; +} From 20eb2df9be6ae00f560f91d191b2f7ee9854f8ef Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Tue, 28 Jul 2015 14:25:47 -0700 Subject: [PATCH 4/8] Fix to nicen up the layout for the inline-adding and Bootstrapify it. --- app/views/backend/hardware/edit.blade.php | 96 +++++++++++------------ 1 file changed, 46 insertions(+), 50 deletions(-) diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index e32c5a8751..7e3befe241 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -18,63 +18,55 @@

Modal title

- +
+
+
+
+
+
+
{{ Form::select('modal-manufacturer', $manufacturer , '', array('class'=>'select2 parent', 'style'=>'width:350px','id' =>'modal-manufacturer_id')) }}
+
- +
+
+
{{ Form::select('modal-category', $category ,'', array('class'=>'select2 parent', 'style'=>'width:350px','id' => 'modal-category_id')) }}
+
+
+
+
+
- +
+
+
{{ Form::countries('country', Input::old('country'), 'select2 country',"modal-country") }}
+
+
+
+
+
- +
+
+
+
+
+
+
+
- +
+
+
+
- - - - - - - - - - - - - - +
+
+
+
@@ -381,9 +373,13 @@ $(function () { 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) { From c1ae844308a879fe9cb4d7999ddabba4bfa5fe9d Mon Sep 17 00:00:00 2001 From: madd15 Date: Wed, 29 Jul 2015 10:13:18 +0930 Subject: [PATCH 5/8] Fix #972 - Change back button to work --- app/views/backend/accessories/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/backend/accessories/view.blade.php b/app/views/backend/accessories/view.blade.php index a2f9876c77..db3f40fde5 100644 --- a/app/views/backend/accessories/view.blade.php +++ b/app/views/backend/accessories/view.blade.php @@ -15,7 +15,7 @@
- @lang('general.back')
+ @lang('general.back')

{{{ $accessory->name }}} @lang('general.accessory') From 65bf156da1625b41a961e998d513e641241bbd8f Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 28 Jul 2015 18:40:06 -0700 Subject: [PATCH 6/8] Better spacing for modal for elements --- public/assets/css/bootstrap/bootstrap-overrides.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/assets/css/bootstrap/bootstrap-overrides.css b/public/assets/css/bootstrap/bootstrap-overrides.css index 8a906fb557..3bfe0dbe1e 100644 --- a/public/assets/css/bootstrap/bootstrap-overrides.css +++ b/public/assets/css/bootstrap/bootstrap-overrides.css @@ -349,3 +349,7 @@ table th span.line{ vertical-align: middle; padding-left: 5px; } + +.dynamic-form-row { + padding-bottom: 50px; +} From 0c9018289b3fed49154e2d7138d4b760ce7d2752 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 28 Jul 2015 20:24:58 -0700 Subject: [PATCH 7/8] Fixes #970 --- app/controllers/admin/LocationsController.php | 12 ++++++++---- app/lang/en/admin/locations/message.php | 2 ++ app/models/Location.php | 6 +++--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/app/controllers/admin/LocationsController.php b/app/controllers/admin/LocationsController.php index 22ce45cd62..b8c90e767c 100755 --- a/app/controllers/admin/LocationsController.php +++ b/app/controllers/admin/LocationsController.php @@ -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')); diff --git a/app/lang/en/admin/locations/message.php b/app/lang/en/admin/locations/message.php index b2277f9a9d..982d2b3603 100755 --- a/app/lang/en/admin/locations/message.php +++ b/app/lang/en/admin/locations/message.php @@ -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 asset and cannot be deleted. Please update your locations to no longer reference this location and try again. ', 'create' => array( diff --git a/app/models/Location.php b/app/models/Location.php index 3b076f21c7..5f6fd95b38 100755 --- a/app/models/Location.php +++ b/app/models/Location.php @@ -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','id')->where('parent_id','=',$this->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 From 480fd78c51bd7b3fac65c4e800855eb5227e00a0 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 28 Jul 2015 20:45:32 -0700 Subject: [PATCH 8/8] Disllow delete if parent --- app/lang/en/admin/locations/message.php | 2 +- app/models/Location.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/lang/en/admin/locations/message.php b/app/lang/en/admin/locations/message.php index 982d2b3603..3ba1eed3b6 100755 --- a/app/lang/en/admin/locations/message.php +++ b/app/lang/en/admin/locations/message.php @@ -5,7 +5,7 @@ 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 asset and cannot be deleted. Please update your locations 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( diff --git a/app/models/Location.php b/app/models/Location.php index 5f6fd95b38..8a83eaa809 100755 --- a/app/models/Location.php +++ b/app/models/Location.php @@ -33,7 +33,7 @@ class Location extends Elegant } public function childLocations() { - return $this->hasMany('Location','id')->where('parent_id','=',$this->id); + return $this->hasMany('Location','parent_id'); } public static function getLocationHierarchy($locations, $parent_id = null) {