Fixes #766

Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
snipe · Apr 29, 2015 · a0fce2e · a0fce2e
1 parent bce0654
commit a0fce2e
Show file tree

Hide file tree

Showing 28 changed files with 95 additions and 25 deletions.
diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php
@@ -438,7 +438,7 @@ public function postCheckout($assetId)
             $data['log_id'] = $logaction->id;
             $data['eula'] = $asset->getEula();
             $data['first_name'] = $user->first_name;
-            $data['item_name'] = $asset->assetNameForEula();
+            $data['item_name'] = $asset->showAssetName();
             $data['require_acceptance'] = $asset->requireAcceptance();
 
 

diff --git a/app/lang/ar/general.php b/app/lang/ar/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'العنوان',
     'admin'					=> 'الإدارة',
     'all_assets'			=> 'كل الأصول',
@@ -56,13 +57,15 @@
     'id'  					=> 'الرقم',
     'image_delete'         	=> 'حذف الصورة',
     'image_upload'         	=> 'رفع صورة',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'الإسم الأخير',
     'license'				=> 'الرخص',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'الرخص المتاحة',
     'licenses'				=> 'الرخص',
     'list_all'				=> 'عرض الكل',
+    'loading'				=> 'Loading',
     'location'              => 'الموقع',
     'locations'				=> 'المواقع',
     'logout'				=> 'تسجيل خروج',

diff --git a/app/lang/cs/general.php b/app/lang/cs/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adresa',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Všechna zařízení',
@@ -56,13 +57,15 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Smazat obrázek',
     'image_upload'         	=> 'Nahrát obrázek',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Příjmení',
     'license'				=> 'Licence',
     'license_report'        => 'Report licencí',
     'licenses_available'	=> 'dostupných licencí',
     'licenses'				=> 'Licence',
     'list_all'				=> 'Vypsat vše',
+    'loading'				=> 'Loading',
     'location'              => 'Lokalita',
     'locations'				=> 'Umístění',
     'logout'				=> 'Odhlásit',

diff --git a/app/lang/da/general.php b/app/lang/da/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Tilbehør',
     'accessory'				=> 'Tilbehør',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Addresse',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Alle aktiver',
@@ -56,13 +57,15 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Slet billede',
     'image_upload'         	=> 'Upload billede',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Efternavn',
     'license'				=> 'Licens',
     'license_report'        => 'Licensrapport',
     'licenses_available'	=> 'Tilgængelige licenser',
     'licenses'				=> 'Licenser',
     'list_all'				=> 'Vis alle',
+    'loading'				=> 'Loading',
     'location'              => 'Lokation',
     'locations'				=> 'Lokationer',
     'logout'				=> 'Log ud',

diff --git a/app/lang/de/general.php b/app/lang/de/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Zubehör',
     'accessory'				=> 'Zubehör',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Supplier Address',
     'admin'					=> 'Administrator',
     'all_assets'			=> 'Alle Assets',
@@ -56,13 +57,15 @@
     'id'  					=> 'Id',
     'image_delete'         	=> 'Bild löschen',
     'image_upload'         	=> 'Bild hinzufügen',
+    'item'  				=> 'Item',
     'last'					=> 'Letztes',
     'last_name'				=> 'Familienname',
     'license'				=> 'Lizenz',
     'license_report'        => 'Lizenz Report',
     'licenses_available'	=> 'Verfügbare Lizenzen',
     'licenses'				=> 'Lizenzen',
     'list_all'				=> 'Alle auflisten',
+    'loading'				=> 'Loading',
     'location'              => 'Standort',
     'locations'				=> 'Standorte',
     'logout'				=> 'Abmelden',

diff --git a/app/lang/en-GB/general.php b/app/lang/en-GB/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
@@ -56,13 +57,15 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
+    'loading'				=> 'Loading',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',

diff --git a/app/lang/en/general.php b/app/lang/en/general.php
@@ -57,6 +57,7 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',

diff --git a/app/lang/es-ES/general.php b/app/lang/es-ES/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accesorios',
     'accessory'				=> 'Accesorio',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Dirección',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Todos los Equipos',
@@ -56,13 +57,15 @@
     'id'  					=> 'Id',
     'image_delete'         	=> 'Borrar imagen',
     'image_upload'         	=> 'Enviar imagen',
+    'item'  				=> 'Item',
     'last'					=> 'Último',
     'last_name'				=> 'Apellidos',
     'license'				=> 'Licencia',
     'license_report'        => 'Reporte de Licencias',
     'licenses_available'	=> 'licencias libres',
     'licenses'				=> 'Licencias',
     'list_all'				=> 'Listar Todo',
+    'loading'				=> 'Loading',
     'location'              => 'Localización',
     'locations'				=> 'Localizaciones',
     'logout'				=> 'Desconexión',

diff --git a/app/lang/fi/general.php b/app/lang/fi/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Osoite',
     'admin'					=> 'Ylläpitäjä',
     'all_assets'			=> 'Kaikki Laitteet',
@@ -56,13 +57,15 @@
     'id'  					=> 'Tunnus',
     'image_delete'         	=> 'Poista Kuva',
     'image_upload'         	=> 'Lähetä Kuva',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Sukunimi',
     'license'				=> 'Lisenssi',
     'license_report'        => 'Lisenssiraportti',
     'licenses_available'	=> 'Vapaana olevat lisenssit',
     'licenses'				=> 'Lisenssit',
     'list_all'				=> 'Listaa Kaikki',
+    'loading'				=> 'Loading',
     'location'              => 'Sijainti',
     'locations'				=> 'Sijainnit',
     'logout'				=> 'Kirjaudu Ulos',

diff --git a/app/lang/fr/admin/accessories/message.php b/app/lang/fr/admin/accessories/message.php
@@ -2,23 +2,23 @@
 
 return array(
 
-    'does_not_exist' => 'Category does not exist.',
+    'does_not_exist' => 'La catégorie n\'éxiste pas.',
     'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
 
     'create' => array(
-        'error'   => 'Category was not created, please try again.',
-        'success' => 'Category created successfully.'
+        'error'   => 'La catégorie n\'a pas été crée, veuillez essayer à nouveau.',
+        'success' => 'Catégorie créée avec succès.'
     ),
 
     'update' => array(
-        'error'   => 'Category was not updated, please try again',
+        'error'   => 'Catégorie n\'a pas été actualisée, veuillez réessayer',
         'success' => 'Category updated successfully.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this category?',
-        'error'   => 'There was an issue deleting the category. Please try again.',
-        'success' => 'The category was deleted successfully.'
+        'confirm'   => 'Êtes vous sûr de vouloir effacer cette catégorie?',
+        'error'   => 'Problème lors de l\'effacement de cette catégorie. Veuillez réessayer.',
+        'success' => 'Catégorie effacée.'
     ),
 
      'checkout' => array(

diff --git a/app/lang/fr/general.php b/app/lang/fr/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adresse',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Tous les actifs',
@@ -56,13 +57,15 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Supprimer l\'image',
     'image_upload'         	=> 'Charger une image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Nom',
     'license'				=> 'Licence',
     'license_report'        => 'Rapport de licence',
     'licenses_available'	=> 'Licences disponibles',
     'licenses'				=> 'Licences',
     'list_all'				=> 'Lister tout',
+    'loading'				=> 'Loading',
     'location'              => 'Lieu',
     'locations'				=> 'Lieux',
     'logout'				=> 'Se déconnecter',

diff --git a/app/lang/hu/general.php b/app/lang/hu/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Cím',
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
@@ -56,13 +57,15 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Vezetéknév',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
+    'loading'				=> 'Loading',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Kijelentkezés',

diff --git a/app/lang/it/general.php b/app/lang/it/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessori',
     'accessory'				=> 'Accessorio',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Indirizzo',
     'admin'					=> 'Amministratore',
     'all_assets'			=> 'Tutti gli Asset',
@@ -56,13 +57,15 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Cancella l\'Immagine',
     'image_upload'         	=> 'Carica immagine',
+    'item'  				=> 'Item',
     'last'					=> 'Ultimo',
     'last_name'				=> 'Cognome',
     'license'				=> 'Licenza',
     'license_report'        => 'Report Licenze',
     'licenses_available'	=> 'Licenze Disponibili',
     'licenses'				=> 'Licenze',
     'list_all'				=> 'Visualizza Tutti',
+    'loading'				=> 'Loading',
     'location'              => 'Luogo',
     'locations'				=> 'Luoghi',
     'logout'				=> 'logout',

diff --git a/app/lang/ja/general.php b/app/lang/ja/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
     'admin'					=> 'Admin',
     'all_assets'			=> 'All Assets',
@@ -56,13 +57,15 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Delete Image',
     'image_upload'         	=> 'Upload Image',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Last Name',
     'license'				=> 'License',
     'license_report'        => 'License Report',
     'licenses_available'	=> 'licenses available',
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
+    'loading'				=> 'Loading',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',

diff --git a/app/lang/ms/general.php b/app/lang/ms/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Alamat',
     'admin'					=> 'Pentadbir',
     'all_assets'			=> 'Semua Harta',
@@ -56,13 +57,15 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Hapuskan imej',
     'image_upload'         	=> 'Muat naik imej',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Nama Keluarga',
     'license'				=> 'Lesen',
     'license_report'        => 'Laporan Lesen',
     'licenses_available'	=> 'Lesen Yang Ada',
     'licenses'				=> 'Lesen',
     'list_all'				=> 'Senaraikan Semua',
+    'loading'				=> 'Loading',
     'location'              => 'Lokasi',
     'locations'				=> 'Lokasi',
     'logout'				=> 'Log keluar',

diff --git a/app/lang/nl/general.php b/app/lang/nl/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Accessories',
     'accessory'				=> 'Accessory',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adres',
     'admin'					=> 'Beheerder',
     'all_assets'			=> 'Alle materialen',
@@ -56,13 +57,15 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Afbeelding verwijderen',
     'image_upload'         	=> 'Afbeelding uploaden',
+    'item'  				=> 'Item',
     'last'					=> 'Last',
     'last_name'				=> 'Achternaam',
     'license'				=> 'Licentie',
     'license_report'        => 'Licentierapport',
     'licenses_available'	=> 'beschikbare licenties',
     'licenses'				=> 'Licenties',
     'list_all'				=> 'Toon Alles',
+    'loading'				=> 'Loading',
     'location'              => 'Locatie',
     'locations'				=> 'Locaties',
     'logout'				=> 'Afmelden',

diff --git a/app/lang/no/general.php b/app/lang/no/general.php
@@ -5,6 +5,7 @@
 
     'accessories'			=> 'Tilbehør',
     'accessory'				=> 'Tilbehør',
+    'activity_report'		=> 'Activity Report',
     'address'				=> 'Adresse',
     'admin'					=> 'Admin',
     'all_assets'			=> 'Alle eiendeler',
@@ -56,13 +57,15 @@
     'id'  					=> 'ID',
     'image_delete'         	=> 'Slett bilde',
     'image_upload'         	=> 'Last opp bilde',
+    'item'  				=> 'Item',
     'last'					=> 'Siste',
     'last_name'				=> 'Etternavn',
     'license'				=> 'Lisens',
     'license_report'        => 'Lisensrapport',
     'licenses_available'	=> 'Tilgjengelige lisenser',
     'licenses'				=> 'Lisenser',
     'list_all'				=> 'List alle',
+    'loading'				=> 'Loading',
     'location'              => 'Lokasjon',
     'locations'				=> 'Lokasjoner',
     'logout'				=> 'Logg ut',