Skip to content

Commit 9adb2c2

Browse files
snipesnipe
committed
Squashed commit of the following:
commit dddbf27 Author: snipe <[email protected]> Date: Wed Sep 18 14:18:52 2024 +0100 Updated language strings Signed-off-by: snipe <[email protected]> commit fcefcc8 Merge: 04bb3ee 3519a82 Author: snipe <[email protected]> Date: Wed Sep 18 13:44:44 2024 +0100 Merge pull request #15512 from marcusmoore/testing/fmcs Added tests for delete methods in api commit 04bb3ee Merge: 154d5d8 f963b9a Author: snipe <[email protected]> Date: Wed Sep 18 13:41:37 2024 +0100 Merge pull request #15521 from uberbrady/improve_country_selector Fix selected-index of Countries drop-down [fd-44144] commit f963b9a Author: Brady Wetherington <[email protected]> Date: Wed Sep 18 13:24:26 2024 +0100 Fix selected-index of Countries drop-down commit 154d5d8 Merge: 6c996b7 9e5f6d6 Author: snipe <[email protected]> Date: Tue Sep 17 23:40:25 2024 +0100 Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets [Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags commit 3519a82 Author: Marcus Moore <[email protected]> Date: Mon Sep 16 16:55:20 2024 -0700 Fix name: TestsFullMultipleCompaniesSupport commit a629df0 Author: Marcus Moore <[email protected]> Date: Mon Sep 16 14:49:08 2024 -0700 Implement interfaces on existing test classes commit 9a13fca Author: Marcus Moore <[email protected]> Date: Mon Sep 16 14:38:38 2024 -0700 Pluralize commit f5705a1 Author: Marcus Moore <[email protected]> Date: Mon Sep 16 14:34:55 2024 -0700 More unification commit f325c4a Author: Marcus Moore <[email protected]> Date: Mon Sep 16 14:32:38 2024 -0700 Unify assertion method commit 1fddacd Author: Marcus Moore <[email protected]> Date: Mon Sep 16 14:25:11 2024 -0700 Re-order test methods commit 4af893d Author: Marcus Moore <[email protected]> Date: Mon Sep 16 14:20:24 2024 -0700 Improve assertions commit b8b3f91 Author: Marcus Moore <[email protected]> Date: Mon Sep 16 13:55:18 2024 -0700 Formatting commit 7f40f55 Author: Marcus Moore <[email protected]> Date: Mon Sep 16 13:52:02 2024 -0700 Add tests for delete supplier endpoint commit b06e8d4 Author: Marcus Moore <[email protected]> Date: Mon Sep 16 13:37:08 2024 -0700 Add tests for delete status label endpoint commit c269184 Author: Marcus Moore <[email protected]> Date: Mon Sep 16 13:29:41 2024 -0700 Add tests for delete predefined kit endpoint commit 53c673d Author: Marcus Moore <[email protected]> Date: Mon Sep 16 13:13:12 2024 -0700 Add tests for delete manufacturer endpoint commit 50730fc Author: Marcus Moore <[email protected]> Date: Mon Sep 16 12:37:18 2024 -0700 Add tests for delete location endpoint commit 60a54ce Author: Marcus Moore <[email protected]> Date: Mon Sep 16 12:33:30 2024 -0700 Add tests for delete license endpoint commit 446e962 Author: Marcus Moore <[email protected]> Date: Mon Sep 16 10:38:51 2024 -0700 Add tests for delete group endpoint commit 79a4bb7 Author: Marcus Moore <[email protected]> Date: Mon Sep 16 10:35:44 2024 -0700 Add tests for delete depreciation endpoint commit 2f76c1b Author: Marcus Moore <[email protected]> Date: Mon Sep 16 10:33:21 2024 -0700 Add assertion commit 38b9f4a Author: Marcus Moore <[email protected]> Date: Mon Sep 16 10:29:20 2024 -0700 Add tests for delete departments endpoint commit 3105f53 Author: Marcus Moore <[email protected]> Date: Thu Sep 12 16:54:29 2024 -0700 Add tests for delete custom fieldsets endpoint commit 2047cfe Author: Marcus Moore <[email protected]> Date: Thu Sep 12 16:20:32 2024 -0700 Add tests for delete custom fields endpoint commit e3268d3 Author: Marcus Moore <[email protected]> Date: Thu Sep 12 16:00:02 2024 -0700 Add tests for delete consumable endpoint commit 6df8b0a Author: Marcus Moore <[email protected]> Date: Thu Sep 12 15:52:07 2024 -0700 Add tests for delete component endpoint commit 910f13c Author: Marcus Moore <[email protected]> Date: Thu Sep 12 15:38:30 2024 -0700 Add tests for delete companies endpoint commit 8ce2512 Author: Marcus Moore <[email protected]> Date: Thu Sep 12 13:54:44 2024 -0700 Add tests for delete category endpoint commit 0ec415d Author: Marcus Moore <[email protected]> Date: Thu Sep 12 13:46:22 2024 -0700 Clean up commit 2044570 Author: Marcus Moore <[email protected]> Date: Thu Sep 12 13:39:36 2024 -0700 Add tests for delete asset model endpoint commit b336c62 Author: Marcus Moore <[email protected]> Date: Thu Sep 12 13:32:42 2024 -0700 Pluralize test classes commit 5299b3e Author: Marcus Moore <[email protected]> Date: Thu Sep 12 13:29:44 2024 -0700 Remove code handled by CompanyableChildTrait commit 872b76b Author: Marcus Moore <[email protected]> Date: Thu Sep 12 13:29:10 2024 -0700 Add tests for delete asset maintenance endpoint commit 275cf46 Author: Marcus Moore <[email protected]> Date: Thu Sep 12 13:16:37 2024 -0700 Add tests for delete asset endpoint commit 5c2660b Author: Marcus Moore <[email protected]> Date: Thu Sep 12 13:02:32 2024 -0700 Introduce interface commit c7ae9d9 Author: Marcus Moore <[email protected]> Date: Thu Sep 12 12:58:47 2024 -0700 Add tests for delete accessory endpoint commit 9e5f6d6 Author: Brady Wetherington <[email protected]> Date: Wed Sep 11 15:45:01 2024 +0100 Improve multi-asset create when using numeric prefixes to asset_tags Signed-off-by: snipe <[email protected]>
1 parent 634a4af commit 9adb2c2

File tree

252 files changed

+2559
-1307
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+2559
-1307
lines changed

‎app/Http/Controllers/Api/AssetMaintenancesController.php

-4
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,6 @@ public function destroy($assetMaintenanceId) : JsonResponse
188188
// Check if the asset maintenance exists
189189
$assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
190190

191-
if (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
192-
return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot delete a maintenance for that asset'));
193-
}
194-
195191
$assetMaintenance->delete();
196192

197193
return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.delete.success')));

‎app/Http/Controllers/Api/LicensesController.php

-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ public function update(Request $request, $id) : JsonResponse | array
220220
*/
221221
public function destroy($id) : JsonResponse
222222
{
223-
//
224223
$license = License::findOrFail($id);
225224
$this->authorize('delete', $license);
226225

‎app/Models/PredefinedKit.php

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use App\Models\Traits\Searchable;
66
use App\Presenters\Presentable;
7+
use Illuminate\Database\Eloquent\Factories\HasFactory;
78
use Illuminate\Validation\Rule;
89
use Watson\Validating\ValidatingTrait;
910

@@ -16,6 +17,7 @@
1617
class PredefinedKit extends SnipeModel
1718
{
1819
protected $presenter = \App\Presenters\PredefinedKitPresenter::class;
20+
use HasFactory;
1921
use Presentable;
2022
protected $table = 'kits';
2123

‎database/factories/PredefinedKitFactory.php

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
namespace Database\Factories;
4+
5+
use Illuminate\Database\Eloquent\Factories\Factory;
6+
7+
/**
8+
* @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\PredefinedKit>
9+
*/
10+
class PredefinedKitFactory extends Factory
11+
{
12+
/**
13+
* Define the model's default state.
14+
*
15+
* @return array<string, mixed>
16+
*/
17+
public function definition(): array
18+
{
19+
return [
20+
'name' => $this->faker->words(3, true),
21+
];
22+
}
23+
}

‎database/factories/UserFactory.php

+65-5
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,11 @@ public function viewRequestableAssets()
141141
return $this->appendPermission(['assets.view.requestable' => '1']);
142142
}
143143

144+
public function deleteAssetModels()
145+
{
146+
return $this->appendPermission(['models.delete' => '1']);
147+
}
148+
144149
public function viewAccessories()
145150
{
146151
return $this->appendPermission(['accessories.view' => '1']);
@@ -201,6 +206,11 @@ public function checkoutConsumables()
201206
return $this->appendPermission(['consumables.checkout' => '1']);
202207
}
203208

209+
public function deleteDepartments()
210+
{
211+
return $this->appendPermission(['departments.delete' => '1']);
212+
}
213+
204214
public function viewDepartments()
205215
{
206216
return $this->appendPermission(['departments.view' => '1']);
@@ -241,11 +251,6 @@ public function viewComponents()
241251
return $this->appendPermission(['components.view' => '1']);
242252
}
243253

244-
public function createCompanies()
245-
{
246-
return $this->appendPermission(['companies.create' => '1']);
247-
}
248-
249254
public function createComponents()
250255
{
251256
return $this->appendPermission(['components.create' => '1']);
@@ -271,6 +276,16 @@ public function checkoutComponents()
271276
return $this->appendPermission(['components.checkout' => '1']);
272277
}
273278

279+
public function createCompanies()
280+
{
281+
return $this->appendPermission(['companies.create' => '1']);
282+
}
283+
284+
public function deleteCompanies()
285+
{
286+
return $this->appendPermission(['companies.delete' => '1']);
287+
}
288+
274289
public function viewUsers()
275290
{
276291
return $this->appendPermission(['users.view' => '1']);
@@ -291,6 +306,16 @@ public function deleteUsers()
291306
return $this->appendPermission(['users.delete' => '1']);
292307
}
293308

309+
public function deleteCategories()
310+
{
311+
return $this->appendPermission(['categories.delete' => '1']);
312+
}
313+
314+
public function deleteLocations()
315+
{
316+
return $this->appendPermission(['locations.delete' => '1']);
317+
}
318+
294319
public function canEditOwnLocation()
295320
{
296321
return $this->appendPermission(['self.edit_location' => '1']);
@@ -306,6 +331,41 @@ public function canImport()
306331
return $this->appendPermission(['import' => '1']);
307332
}
308333

334+
public function deleteCustomFields()
335+
{
336+
return $this->appendPermission(['customfields.delete' => '1']);
337+
}
338+
339+
public function deleteCustomFieldsets()
340+
{
341+
return $this->appendPermission(['customfields.delete' => '1']);
342+
}
343+
344+
public function deleteDepreciations()
345+
{
346+
return $this->appendPermission(['depreciations.delete' => '1']);
347+
}
348+
349+
public function deleteManufacturers()
350+
{
351+
return $this->appendPermission(['manufacturers.delete' => '1']);
352+
}
353+
354+
public function deletePredefinedKits()
355+
{
356+
return $this->appendPermission(['kits.delete' => '1']);
357+
}
358+
359+
public function deleteStatusLabels()
360+
{
361+
return $this->appendPermission(['statuslabels.delete' => '1']);
362+
}
363+
364+
public function deleteSuppliers()
365+
{
366+
return $this->appendPermission(['suppliers.delete' => '1']);
367+
}
368+
309369
private function appendPermission(array $permission)
310370
{
311371
return $this->state(function ($currentState) use ($permission) {

‎resources/lang/aa-ER/admin/hardware/form.php

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'asset_location_update_default' => 'crwdns6547:0crwdne6547:0',
5656
'asset_location_update_actual' => 'crwdns11852:0crwdne11852:0',
5757
'asset_not_deployable' => 'crwdns6549:0crwdne6549:0',
58+
'asset_not_deployable_checkin' => 'crwdns12752:0crwdne12752:0',
5859
'asset_deployable' => 'crwdns6551:0crwdne6551:0',
5960
'processing_spinner' => 'crwdns11515:0crwdne11515:0',
6061
'optional_infos' => 'crwdns10490:0crwdne10490:0',

‎resources/lang/aa-ER/admin/users/message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'ldap_could_not_search' => 'crwdns1415:0crwdne1415:0',
5454
'ldap_could_not_get_entries' => 'crwdns1416:0crwdne1416:0',
5555
'password_ldap' => 'crwdns1889:0crwdne1889:0',
56-
'multi_company_items_assigned' => 'crwdns12742:0crwdne12742:0'
56+
'multi_company_items_assigned' => 'crwdns12754:0crwdne12754:0'
5757
),
5858

5959
'deletefile' => array(

‎resources/lang/af-ZA/admin/hardware/form.php

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'asset_location_update_default' => 'Update only default location',
5656
'asset_location_update_actual' => 'Update only actual location',
5757
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
58+
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
5859
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
5960
'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
6061
'optional_infos' => 'Optional Information',

‎resources/lang/af-ZA/admin/users/message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'ldap_could_not_search' => 'Kon nie die LDAP-bediener soek nie. Gaan asseblief die LDAP-bediener opstelling in die LDAP-konfigurasie lêer. <br>Error van LDAP-bediener:',
5454
'ldap_could_not_get_entries' => 'Kon nie inskrywings van die LDAP-bediener kry nie. Gaan asseblief die LDAP-bediener opstelling in die LDAP-konfigurasie lêer. <br>Error van LDAP-bediener:',
5555
'password_ldap' => 'Die wagwoord vir hierdie rekening word bestuur deur LDAP / Active Directory. Kontak asseblief u IT-afdeling om u wagwoord te verander.',
56-
'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
56+
'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
5757
),
5858

5959
'deletefile' => array(

‎resources/lang/am-ET/admin/hardware/form.php

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'asset_location_update_default' => 'Update only default location',
5656
'asset_location_update_actual' => 'Update only actual location',
5757
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
58+
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
5859
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
5960
'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
6061
'optional_infos' => 'Optional Information',

‎resources/lang/am-ET/admin/users/message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
5454
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
5555
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
56-
'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
56+
'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
5757
),
5858

5959
'deletefile' => array(

‎resources/lang/ar-SA/admin/hardware/form.php

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'asset_location_update_default' => 'تحديث الموقع الافتراضي فقط',
5656
'asset_location_update_actual' => 'تحديث الموقع الفعلي فقط',
5757
'asset_not_deployable' => 'حالة الأصول هذه غير قابلة للنشر. لا يمكن التحقق من هذه الأصول.',
58+
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
5859
'asset_deployable' => 'حالة تلك الأصول قابلة للنشر. هذا الأصل يمكن إخراجه.',
5960
'processing_spinner' => 'معالجة... (قد يستغرق هذا بعض الوقت على ملفات كبيرة)',
6061
'optional_infos' => 'معلومات اختيارية',

‎resources/lang/ar-SA/admin/users/message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'ldap_could_not_search' => 'تعذر البحث في خادم LDAP. الرجاء التحقق من الاعدادات الخاصة بخادم LDAP في ملف اعدادات LDAP. <br>الخطأ من خادم LDAP:',
5454
'ldap_could_not_get_entries' => 'تعذر الحصول على إدخالات من خادم LDAP. الرجاء التحقق من الاعدادات الخاصة بخادم LDAP في ملف اعدادات LDAP. <br>الخطأ من خادم LDAP:',
5555
'password_ldap' => 'تتم إدارة كلمة المرور لهذا الحساب بواسطة لداب / أكتيف ديركتوري. يرجى الاتصال بقسم تقنية المعلومات لتغيير كلمة المرور.',
56-
'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
56+
'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
5757
),
5858

5959
'deletefile' => array(

‎resources/lang/bg-BG/admin/hardware/form.php

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'asset_location_update_default' => 'Актуализиране на местоположението по подразбиране',
5656
'asset_location_update_actual' => 'Актуализиране само на местоположението',
5757
'asset_not_deployable' => 'Актива не може да бъде предоставен. Този активк не може да бъде изписан.',
58+
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
5859
'asset_deployable' => 'Актива може да бъде предоставен. Този активк може да бъде изписан.',
5960
'processing_spinner' => 'Обработка...(Това може да отнеме време при големи файлове)',
6061
'optional_infos' => 'Допълнителна информация',

‎resources/lang/bg-BG/admin/users/message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'ldap_could_not_search' => 'Проблем при търсенето в LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
5454
'ldap_could_not_get_entries' => 'Проблем при извличането на резултат от LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра:',
5555
'password_ldap' => 'Паролата за този профил се управлява от LDAP / Active Directory. Моля, свържете се с вашия ИТ отдел, за да промените паролата си.',
56-
'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
56+
'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
5757
),
5858

5959
'deletefile' => array(

‎resources/lang/ca-ES/admin/hardware/form.php

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'asset_location_update_default' => 'Update only default location',
5656
'asset_location_update_actual' => 'Update only actual location',
5757
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
58+
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
5859
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
5960
'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
6061
'optional_infos' => 'Optional Information',

‎resources/lang/ca-ES/admin/users/message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
5454
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
5555
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
56-
'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
56+
'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
5757
),
5858

5959
'deletefile' => array(

‎resources/lang/chr-US/admin/hardware/form.php

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'asset_location_update_default' => 'Update only default location',
5656
'asset_location_update_actual' => 'Update only actual location',
5757
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
58+
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
5859
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
5960
'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
6061
'optional_infos' => 'Optional Information',

‎resources/lang/chr-US/admin/users/message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
5454
'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
5555
'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
56-
'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
56+
'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
5757
),
5858

5959
'deletefile' => array(

‎resources/lang/cs-CZ/admin/hardware/form.php

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'asset_location_update_default' => 'Aktualizovat pouze výchozí umístění',
5656
'asset_location_update_actual' => 'Aktualizovat pouze skutečnou polohu',
5757
'asset_not_deployable' => 'Tento majetek nelze vyskladnit.',
58+
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
5859
'asset_deployable' => 'Tento majetek lze vyskladnit.',
5960
'processing_spinner' => 'Zpracovávání... (S velkými soubory to může chvíli trvat)',
6061
'optional_infos' => 'Volitelné informace',

‎resources/lang/cs-CZ/admin/users/message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'ldap_could_not_search' => 'Nelze vyhledat server LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP. <br>Chyba serveru LDAP:',
5454
'ldap_could_not_get_entries' => 'Nelze získat záznamy ze serveru LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP. <br>Chyba serveru LDAP:',
5555
'password_ldap' => 'Heslo pro tento účet je spravováno serverem LDAP / Active Directory. Obraťte se na oddělení IT a změňte heslo.',
56-
'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
56+
'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
5757
),
5858

5959
'deletefile' => array(

‎resources/lang/cy-GB/admin/hardware/form.php

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'asset_location_update_default' => 'Update only default location',
5656
'asset_location_update_actual' => 'Update only actual location',
5757
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
58+
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
5859
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
5960
'processing_spinner' => 'Processing... (This might take a bit of time on large files)',
6061
'optional_infos' => 'Optional Information',

‎resources/lang/cy-GB/admin/users/message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'ldap_could_not_search' => 'Wedi methu cyraedd y server LDAP. Gwiriwch eich gosodiadau LDAP. <br>Error from LDAP Server:',
5454
'ldap_could_not_get_entries' => 'Wedi methu llwytho data trwy LDAP. Gwiriwch eich gosodiadau LDAP. <br>Error from LDAP Server:',
5555
'password_ldap' => 'Mae eich cyfrinair wedi\'i rheoli trwy LDAP/Active Directory. Cysylltwch a\'r Adran TGCh i\'w newid. ',
56-
'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
56+
'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
5757
),
5858

5959
'deletefile' => array(

‎resources/lang/da-DK/admin/hardware/form.php

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
'asset_location_update_default' => 'Opdater kun standardplacering',
5656
'asset_location_update_actual' => 'Opdater kun den faktiske placering',
5757
'asset_not_deployable' => 'Denne aktivstatus er ikke implementerbar. Dette aktiv kan ikke tjekkes ud.',
58+
'asset_not_deployable_checkin' => 'That asset status is not deployable. Using this status label will checkin the asset.',
5859
'asset_deployable' => 'Denne status er anvendelig. Dette aktiv kan tjekkes ud.',
5960
'processing_spinner' => 'Behandler... (Dette kan tage lidt tid på store filer)',
6061
'optional_infos' => 'Valgfri Information',

‎resources/lang/da-DK/admin/users/message.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
'ldap_could_not_search' => 'Kunne ikke søge på LDAP-serveren. Tjek venligst din LDAP-serverkonfiguration i LDAP-konfigurationsfilen. <br>Error fra LDAP-server:',
5454
'ldap_could_not_get_entries' => 'Kunne ikke få poster fra LDAP-serveren. Tjek venligst din LDAP-serverkonfiguration i LDAP-konfigurationsfilen. <br>Error fra LDAP-server:',
5555
'password_ldap' => 'Adgangskoden til denne konto administreres af LDAP / Active Directory. Kontakt din it-afdeling for at ændre dit kodeord.',
56-
'multi_company_items_assigned' => 'This user has items assigned, please check them in before moving companies.'
56+
'multi_company_items_assigned' => 'This user has items assigned that belong to a different company. Please check them in or edit their company.'
5757
),
5858

5959
'deletefile' => array(

0 commit comments

Comments
 (0)