From 33ae422b2f5d755cf46b418574a30dfb80632b53 Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Thu, 11 Oct 2018 01:04:35 +0200 Subject: [PATCH] * [FIX] Pager was not displayed on auth tokens list * [ADD] Added special filters for account searching on management tab * [MOD] Code refactoring Signed-off-by: nuxsmin --- app/locales/en_GB/LC_MESSAGES/messages.mo | Bin 104735 -> 104908 bytes app/locales/en_GB/LC_MESSAGES/messages.po | 761 +++++++++--------- app/locales/en_US/LC_MESSAGES/messages.mo | Bin 104735 -> 104908 bytes app/locales/en_US/LC_MESSAGES/messages.po | 761 +++++++++--------- .../api/Controllers/AccountController.php | 4 +- .../Controllers/AccessManagerController.php | 4 +- .../Controllers/AccountManagerController.php | 27 +- .../web/Controllers/AuthTokenController.php | 10 +- .../Helpers/Account/AccountActionsHelper.php | 14 +- .../Helpers/Account/AccountSearchHelper.php | 170 ++-- .../Controllers/Helpers/Grid/AccountGrid.php | 23 +- .../Helpers/Grid/AccountHistoryGrid.php | 22 +- .../Helpers/Grid/AuthTokenGrid.php | 28 +- .../Controllers/Helpers/Grid/CategoryGrid.php | 26 +- .../Controllers/Helpers/Grid/ClientGrid.php | 24 +- .../Helpers/Grid/CustomFieldGrid.php | 28 +- .../Controllers/Helpers/Grid/EventlogGrid.php | 20 +- .../web/Controllers/Helpers/Grid/FileGrid.php | 20 +- .../web/Controllers/Helpers/Grid/GridBase.php | 12 +- .../Helpers/Grid/ItemPresetGrid.php | 26 +- .../Helpers/Grid/NotificationGrid.php | 38 +- .../Controllers/Helpers/Grid/PluginGrid.php | 22 +- .../Helpers/Grid/PublicLinkGrid.php | 28 +- .../web/Controllers/Helpers/Grid/TagGrid.php | 22 +- .../Controllers/Helpers/Grid/TrackGrid.php | 20 +- .../web/Controllers/Helpers/Grid/UserGrid.php | 32 +- .../Helpers/Grid/UserGroupGrid.php | 22 +- .../Helpers/Grid/UserProfileGrid.php | 20 +- .../web/Controllers/Helpers/LayoutHelper.php | 2 +- .../views/_partials/fixed-header.inc | 4 +- .../views/_partials/help_account_search.inc | 29 + .../material-blue/views/account/actions.inc | 6 +- .../views/account/search-rows.inc | 4 +- .../views/account/search-searchbox.inc | 28 +- .../views/grid/datagrid-grid.inc | 11 +- .../views/grid/datagrid-table-simple.inc | 2 +- .../views/grid/datagrid-table.inc | 2 +- .../views/grid/datatabs-grid.inc | 2 +- lib/SP/Bootstrap.php | 6 + .../DataGrid/{ => Action}/DataGridAction.php | 6 +- .../{ => Action}/DataGridActionBase.php | 8 +- .../DataGrid/Action/DataGridActionHelp.php | 63 ++ .../{ => Action}/DataGridActionInterface.php | 6 +- .../{ => Action}/DataGridActionSearch.php | 6 +- .../{ => Action}/DataGridActionType.php | 5 +- lib/SP/Html/DataGrid/DataGridBase.php | 25 +- lib/SP/Html/DataGrid/DataGridInterface.php | 5 +- .../DataGrid/{ => Layout}/DataGridHeader.php | 6 +- .../{ => Layout}/DataGridHeaderBase.php | 6 +- .../{ => Layout}/DataGridHeaderInterface.php | 2 +- .../{ => Layout}/DataGridHeaderSort.php | 8 +- .../DataGrid/{ => Layout}/DataGridPager.php | 6 +- .../{ => Layout}/DataGridPagerBase.php | 7 +- .../{ => Layout}/DataGridPagerInterface.php | 7 +- .../Account/AccountFileRepository.php | 32 +- .../Account/AccountRepository.php | 39 +- .../AuthToken/AuthTokenRepository.php | 28 +- .../Category/CategoryRepository.php | 7 +- .../Repositories/Client/ClientRepository.php | 7 +- .../CustomField/CustomFieldDefRepository.php | 6 +- .../EventLog/EventlogRepository.php | 9 +- .../ItemPreset/ItemPresetRepository.php | 52 +- .../Notification/NotificationRepository.php | 14 +- .../Repositories/Plugin/PluginRepository.php | 7 +- .../PublicLink/PublicLinkRepository.php | 55 +- lib/SP/Repositories/Tag/TagRepository.php | 7 +- lib/SP/Repositories/Track/TrackRepository.php | 7 +- lib/SP/Repositories/User/UserRepository.php | 39 +- .../UserGroup/UserGroupRepository.php | 7 +- .../UserProfile/UserProfileRepository.php | 7 +- .../Services/Account/AccountSearchService.php | 23 +- lib/SP/Services/Account/AccountService.php | 5 +- .../Services/Account/AccountServiceTest.php | 22 +- .../SP/Services/Import/KeepassImportTest.php | 4 +- 74 files changed, 1551 insertions(+), 1272 deletions(-) create mode 100644 app/modules/web/themes/material-blue/views/_partials/help_account_search.inc rename lib/SP/Html/DataGrid/{ => Action}/DataGridAction.php (92%) rename lib/SP/Html/DataGrid/{ => Action}/DataGridActionBase.php (98%) create mode 100644 lib/SP/Html/DataGrid/Action/DataGridActionHelp.php rename lib/SP/Html/DataGrid/{ => Action}/DataGridActionInterface.php (98%) rename lib/SP/Html/DataGrid/{ => Action}/DataGridActionSearch.php (96%) rename lib/SP/Html/DataGrid/{ => Action}/DataGridActionType.php (92%) rename lib/SP/Html/DataGrid/{ => Layout}/DataGridHeader.php (91%) rename lib/SP/Html/DataGrid/{ => Layout}/DataGridHeaderBase.php (95%) rename lib/SP/Html/DataGrid/{ => Layout}/DataGridHeaderInterface.php (96%) rename lib/SP/Html/DataGrid/{ => Layout}/DataGridHeaderSort.php (91%) rename lib/SP/Html/DataGrid/{ => Layout}/DataGridPager.php (91%) rename lib/SP/Html/DataGrid/{ => Layout}/DataGridPagerBase.php (98%) rename lib/SP/Html/DataGrid/{ => Layout}/DataGridPagerInterface.php (97%) diff --git a/app/locales/en_GB/LC_MESSAGES/messages.mo b/app/locales/en_GB/LC_MESSAGES/messages.mo index a8ec7a2b3910fbae962999fe845a389350d45e84..687e5a27f44e0043a0bdba205faf68f276ccae55 100644 GIT binary patch delta 30028 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 NWN+vH@k)K~{{U+~7P$Zb delta 29890 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 diff --git a/app/locales/en_GB/LC_MESSAGES/messages.po b/app/locales/en_GB/LC_MESSAGES/messages.po index 8bdf4e16..b76b69cf 100644 --- a/app/locales/en_GB/LC_MESSAGES/messages.po +++ b/app/locales/en_GB/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: sysPass\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-06 12:40+0200\n" -"PO-Revision-Date: 2018-10-06 12:40+0200\n" +"POT-Creation-Date: 2018-10-11 00:17+0200\n" +"PO-Revision-Date: 2018-10-11 00:17+0200\n" "Last-Translator: nuxsmin \n" "Language-Team: nuxsmin@syspass.org\n" "Language: en_GB\n" @@ -25,12 +25,12 @@ msgstr "" "X-Poedit-SearchPath-1: ../../../../lib\n" "X-Poedit-SearchPath-2: ../../../config\n" -#: ../../../../lib/SP/Bootstrap.php:265 +#: ../../../../lib/SP/Bootstrap.php:267 #, php-format msgid "Versión de PHP requerida >= %s <= %s" msgstr "Required PHP version >= %s <= %s" -#: ../../../../lib/SP/Bootstrap.php:267 +#: ../../../../lib/SP/Bootstrap.php:269 msgid "" "Actualice la versión de PHP para que la aplicación funcione correctamente" msgstr "Please update the PHP version to run sysPass" @@ -84,7 +84,7 @@ msgid "Acceso denegado" msgstr "Access denied" #: ../../../../lib/SP/Core/Acl/Acl.php:300 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:107 #: ../../../modules/web/themes/material-blue/views/itemshow/auth_token.inc:30 #: ../../../modules/web/themes/material-blue/views/itemshow/auth_token.inc:32 msgid "Acción" @@ -104,9 +104,9 @@ msgstr "Action" #: ../../../../lib/SP/Services/Auth/LoginService.php:593 #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:238 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:235 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:102 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:106 #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:107 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:107 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:111 #: ../../../modules/web/Controllers/Helpers/Grid/TrackGrid.php:105 #: ../../../modules/web/Controllers/LoginController.php:102 #: ../../../modules/web/Controllers/UserController.php:278 @@ -119,7 +119,7 @@ msgstr "Action" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:91 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:60 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:66 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:133 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:135 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:63 #: ../../../modules/web/themes/material-blue/views/account/viewpass.inc:20 #: ../../../modules/web/themes/material-blue/views/config/general-proxy.inc:65 @@ -137,7 +137,7 @@ msgstr "Action" #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:60 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:62 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:11 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:76 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:91 #: ../../../modules/web/themes/material-blue/views/login/index.inc:15 #: ../../../modules/web/themes/material-blue/views/login/index.inc:84 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:68 @@ -154,7 +154,7 @@ msgstr "Action not found" #: ../../../../lib/SP/Util/ErrorUtil.php:140 #: ../../../modules/web/Controllers/AccountFileController.php:261 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:59 -#: ../../../modules/web/Controllers/AccountManagerController.php:57 +#: ../../../modules/web/Controllers/AccountManagerController.php:67 #: ../../../modules/web/Controllers/AuthTokenController.php:65 #: ../../../modules/web/Controllers/AuthTokenController.php:97 #: ../../../modules/web/Controllers/AuthTokenController.php:162 @@ -201,14 +201,14 @@ msgstr "Action not found" #: ../../../modules/web/Controllers/NotificationController.php:348 #: ../../../modules/web/Controllers/PluginController.php:98 #: ../../../modules/web/Controllers/PluginController.php:117 -#: ../../../modules/web/Controllers/PublicLinkController.php:68 -#: ../../../modules/web/Controllers/PublicLinkController.php:100 -#: ../../../modules/web/Controllers/PublicLinkController.php:162 -#: ../../../modules/web/Controllers/PublicLinkController.php:188 -#: ../../../modules/web/Controllers/PublicLinkController.php:218 -#: ../../../modules/web/Controllers/PublicLinkController.php:259 -#: ../../../modules/web/Controllers/PublicLinkController.php:291 -#: ../../../modules/web/Controllers/PublicLinkController.php:333 +#: ../../../modules/web/Controllers/PublicLinkController.php:71 +#: ../../../modules/web/Controllers/PublicLinkController.php:105 +#: ../../../modules/web/Controllers/PublicLinkController.php:167 +#: ../../../modules/web/Controllers/PublicLinkController.php:193 +#: ../../../modules/web/Controllers/PublicLinkController.php:223 +#: ../../../modules/web/Controllers/PublicLinkController.php:264 +#: ../../../modules/web/Controllers/PublicLinkController.php:296 +#: ../../../modules/web/Controllers/PublicLinkController.php:338 #: ../../../modules/web/Controllers/TagController.php:65 #: ../../../modules/web/Controllers/TagController.php:99 #: ../../../modules/web/Controllers/TagController.php:159 @@ -227,11 +227,11 @@ msgstr "Action not found" #: ../../../modules/web/Controllers/UserController.php:435 #: ../../../modules/web/Controllers/UserGroupController.php:74 #: ../../../modules/web/Controllers/UserGroupController.php:108 -#: ../../../modules/web/Controllers/UserGroupController.php:176 -#: ../../../modules/web/Controllers/UserGroupController.php:206 -#: ../../../modules/web/Controllers/UserGroupController.php:246 -#: ../../../modules/web/Controllers/UserGroupController.php:285 -#: ../../../modules/web/Controllers/UserGroupController.php:324 +#: ../../../modules/web/Controllers/UserGroupController.php:179 +#: ../../../modules/web/Controllers/UserGroupController.php:209 +#: ../../../modules/web/Controllers/UserGroupController.php:249 +#: ../../../modules/web/Controllers/UserGroupController.php:288 +#: ../../../modules/web/Controllers/UserGroupController.php:327 #: ../../../modules/web/Controllers/UserProfileController.php:64 #: ../../../modules/web/Controllers/UserProfileController.php:96 #: ../../../modules/web/Controllers/UserProfileController.php:163 @@ -291,7 +291,7 @@ msgstr "Session cannot be initialized" #: ../../../../lib/SP/Services/CustomField/CustomFieldService.php:203 #: ../../../../lib/SP/Services/Export/XmlVerifyService.php:108 #: ../../../../lib/SP/Services/Import/XmlFileImport.php:79 -#: ../../../../lib/SP/Services/User/UserPassService.php:229 +#: ../../../../lib/SP/Services/User/UserPassService.php:232 #: ../../../modules/web/Controllers/Traits/ItemTrait.php:122 #: ../../../modules/web/Controllers/Traits/ItemTrait.php:177 msgid "Error interno" @@ -328,7 +328,7 @@ msgstr "ON" msgid "OFF" msgstr "OFF" -#: ../../../../lib/SP/Html/DataGrid/DataGridBase.php:306 +#: ../../../../lib/SP/Html/DataGrid/DataGridBase.php:298 #: ../../../../lib/SP/Mvc/View/Template.php:122 #, php-format msgid "No es posible obtener la plantilla \"%s\" : %s" @@ -431,7 +431,7 @@ msgstr "New Plugin" #: ../../../modules/api/Controllers/AccountController.php:139 #: ../../../modules/api/Controllers/AccountController.php:188 #: ../../../modules/api/Controllers/AccountController.php:237 -#: ../../../modules/api/Controllers/AccountController.php:310 +#: ../../../modules/api/Controllers/AccountController.php:312 #: ../../../modules/api/Controllers/CategoryController.php:63 #: ../../../modules/api/Controllers/CategoryController.php:92 #: ../../../modules/api/Controllers/CategoryController.php:122 @@ -449,18 +449,18 @@ msgstr "New Plugin" #: ../../../modules/api/Controllers/UserGroupController.php:123 #: ../../../modules/api/Controllers/UserGroupController.php:152 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:221 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:98 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:99 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:100 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:111 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:102 -#: ../../../modules/web/Controllers/UserGroupController.php:262 -#: ../../../modules/web/Controllers/UserGroupController.php:301 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:107 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:115 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:106 +#: ../../../modules/web/Controllers/UserGroupController.php:265 +#: ../../../modules/web/Controllers/UserGroupController.php:304 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:22 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:33 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:15 @@ -500,9 +500,10 @@ msgstr "Error while searching the group RDN" #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:111 #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:143 #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:140 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:109 #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:108 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:114 -#: ../../../modules/web/Controllers/UserGroupController.php:228 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:118 +#: ../../../modules/web/Controllers/UserGroupController.php:231 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:137 #: ../../../modules/web/themes/material-blue/views/_partials/footer.inc:15 #: ../../../modules/web/themes/material-blue/views/config/encryption.inc:269 @@ -603,7 +604,7 @@ msgstr "Request" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:74 #: ../../../modules/web/Controllers/ConfigBackupController.php:120 #: ../../../modules/web/Controllers/ConfigManagerController.php:171 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:86 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:93 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:20 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:389 #: ../../../config/actions.xml:13 @@ -665,7 +666,7 @@ msgid "Error al modificar la cuenta" msgstr "Error while updating the account" #: ../../../../lib/SP/Repositories/Account/AccountRepository.php:405 -#: ../../../../lib/SP/Repositories/Account/AccountRepository.php:571 +#: ../../../../lib/SP/Repositories/Account/AccountRepository.php:576 #: ../../../../lib/SP/Services/Account/AccountHistoryService.php:75 msgid "No se pudieron obtener los datos de la cuenta" msgstr "Error while retrieving the account data" @@ -894,7 +895,7 @@ msgstr "Error while renewing link" #: ../../../../lib/SP/Repositories/PublicLink/PublicLinkRepository.php:465 #: ../../../../lib/SP/Repositories/PublicLink/PublicLinkRepository.php:506 -#: ../../../../lib/SP/Repositories/PublicLink/PublicLinkRepository.php:526 +#: ../../../../lib/SP/Repositories/PublicLink/PublicLinkRepository.php:527 msgid "Error al obtener enlace" msgstr "Error while retrieving the link" @@ -1191,10 +1192,10 @@ msgstr "The Master Password either is not saved or is wrong" #: ../../../../lib/SP/Services/Auth/LoginService.php:549 #: ../../../../lib/SP/Services/Auth/LoginService.php:592 #: ../../../modules/web/Controllers/AccountFileController.php:235 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:104 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:108 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:108 #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:106 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:117 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:122 #: ../../../modules/web/Controllers/ItemPresetController.php:306 #: ../../../modules/web/Controllers/ItemPresetController.php:345 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:31 @@ -1380,33 +1381,33 @@ msgstr "Error while updating the custom fields data" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:75 #: ../../../modules/web/Controllers/ConfigBackupController.php:122 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:89 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:93 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:293 msgid "Categorías" msgstr "Categories" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:76 #: ../../../modules/web/Controllers/ConfigBackupController.php:121 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:88 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:92 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:325 msgid "Clientes" msgstr "Clients" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:77 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:99 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:103 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:14 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:4 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:9 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:45 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:47 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:50 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:51 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:245 msgid "Usuarios" msgstr "Users" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:78 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:94 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:84 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:43 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:50 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:261 msgid "Grupos" msgstr "Groups" @@ -1500,7 +1501,7 @@ msgstr "Account imported" #: ../../../modules/api/Controllers/AccountController.php:140 #: ../../../modules/api/Controllers/AccountController.php:189 #: ../../../modules/api/Controllers/AccountController.php:238 -#: ../../../modules/api/Controllers/AccountController.php:311 +#: ../../../modules/api/Controllers/AccountController.php:313 #: ../../../modules/web/Controllers/AccountController.php:225 #: ../../../modules/web/Controllers/AccountController.php:710 #: ../../../modules/web/Controllers/AccountController.php:755 @@ -1511,15 +1512,15 @@ msgstr "Account imported" #: ../../../modules/web/Controllers/AccountFileController.php:234 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:112 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:147 -#: ../../../modules/web/Controllers/AccountManagerController.php:115 +#: ../../../modules/web/Controllers/AccountManagerController.php:137 #: ../../../modules/web/Controllers/ClientController.php:213 #: ../../../modules/web/Controllers/ClientController.php:245 #: ../../../modules/web/Controllers/ClientController.php:281 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:214 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:99 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:100 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:108 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:33 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:39 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:47 @@ -1610,14 +1611,14 @@ msgstr "Category imported" #: ../../../modules/web/Controllers/CategoryController.php:254 #: ../../../modules/web/Controllers/CategoryController.php:294 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:228 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:100 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:101 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:107 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:105 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:62 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:64 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:38 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:44 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:96 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:98 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:97 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:99 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:57 msgid "Categoría" msgstr "Category" @@ -2100,12 +2101,12 @@ msgid "Actualización de enlaces públicos" msgstr "Public links update" #: ../../../../lib/SP/Services/Upgrade/UpgradePublicLink.php:89 -#: ../../../modules/web/Controllers/PublicLinkController.php:170 +#: ../../../modules/web/Controllers/PublicLinkController.php:175 msgid "Enlace actualizado" msgstr "Link updated" #: ../../../../lib/SP/Services/Upgrade/UpgradePublicLink.php:90 -#: ../../../modules/web/Controllers/PublicLinkController.php:241 +#: ../../../modules/web/Controllers/PublicLinkController.php:246 msgid "Enlace" msgstr "Link" @@ -2117,7 +2118,7 @@ msgstr "Link" msgid "Reinicie la sesión para cambiarla" msgstr "Please, restart the session for update it" -#: ../../../../lib/SP/Services/User/UserPassService.php:253 +#: ../../../../lib/SP/Services/User/UserPassService.php:256 #: ../../../../lib/SP/Services/User/UserService.php:123 #: ../../../../lib/SP/Services/User/UserService.php:154 #: ../../../../lib/SP/Services/User/UserService.php:173 @@ -2325,14 +2326,14 @@ msgstr "Account added" msgid "Cuenta actualizada" msgstr "Account updated" -#: ../../../modules/api/Controllers/AccountController.php:309 -#: ../../../modules/api/Controllers/AccountController.php:315 +#: ../../../modules/api/Controllers/AccountController.php:311 +#: ../../../modules/api/Controllers/AccountController.php:317 #: ../../../modules/web/Controllers/AccountController.php:883 #: ../../../modules/web/Controllers/AccountController.php:888 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:110 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:115 -#: ../../../modules/web/Controllers/AccountManagerController.php:113 -#: ../../../modules/web/Controllers/AccountManagerController.php:118 +#: ../../../modules/web/Controllers/AccountManagerController.php:135 +#: ../../../modules/web/Controllers/AccountManagerController.php:140 msgid "Cuenta eliminada" msgstr "Account removed" @@ -2434,8 +2435,8 @@ msgstr "Send details in the response" #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:82 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:85 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:93 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:147 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:155 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:149 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:157 #: ../../../modules/web/themes/material-blue/views/account/viewpass.inc:37 #: ../../../modules/web/themes/material-blue/views/config/encryption.inc:288 #: ../../../modules/web/themes/material-blue/views/config/encryption.inc:291 @@ -2463,7 +2464,7 @@ msgstr "Password" #: ../../../modules/api/Controllers/Help/AccountHelp.php:113 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:89 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:104 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:173 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:175 #: ../../../modules/web/themes/material-blue/views/account/details.inc:83 #: ../../../modules/web/themes/material-blue/views/account/details.inc:85 msgid "Fecha Caducidad Clave" @@ -2498,14 +2499,14 @@ msgstr "Client Id" #: ../../../modules/api/Controllers/Help/AccountHelp.php:86 #: ../../../modules/api/Controllers/Help/AccountHelp.php:108 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:99 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:141 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:143 msgid "Usuario de acceso" msgstr "Access user" #: ../../../modules/api/Controllers/Help/AccountHelp.php:87 #: ../../../modules/api/Controllers/Help/AccountHelp.php:109 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:86 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:128 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:130 msgid "URL o IP de acceso" msgstr "Access URL or IP" @@ -2513,7 +2514,7 @@ msgstr "Access URL or IP" #: ../../../modules/api/Controllers/Help/AccountHelp.php:110 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:124 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:78 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:199 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:201 msgid "Notas sobre la cuenta" msgstr "Notes about the account" @@ -2534,8 +2535,8 @@ msgstr "Private Account for Group" #: ../../../modules/api/Controllers/Help/AccountHelp.php:92 #: ../../../modules/api/Controllers/Help/AccountHelp.php:114 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:236 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:238 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:245 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:247 #: ../../../modules/web/themes/material-blue/views/account/viewpass.inc:8 msgid "Cuenta Vinculada" msgstr "Linked Account" @@ -2604,8 +2605,8 @@ msgstr "Client description" #: ../../../modules/api/Controllers/Help/ClientHelp.php:56 #: ../../../modules/api/Controllers/Help/ClientHelp.php:70 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:142 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:147 #: ../../../modules/web/themes/material-blue/views/itemshow/client.inc:62 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:92 msgid "Global" @@ -2674,22 +2675,22 @@ msgstr "Group viewed" #: ../../../modules/api/Controllers/UserGroupController.php:91 #: ../../../modules/api/Controllers/UserGroupController.php:96 -#: ../../../modules/web/Controllers/UserGroupController.php:261 -#: ../../../modules/web/Controllers/UserGroupController.php:265 +#: ../../../modules/web/Controllers/UserGroupController.php:264 +#: ../../../modules/web/Controllers/UserGroupController.php:268 msgid "Grupo creado" msgstr "Group added" #: ../../../modules/api/Controllers/UserGroupController.php:122 #: ../../../modules/api/Controllers/UserGroupController.php:127 -#: ../../../modules/web/Controllers/UserGroupController.php:300 -#: ../../../modules/web/Controllers/UserGroupController.php:304 +#: ../../../modules/web/Controllers/UserGroupController.php:303 +#: ../../../modules/web/Controllers/UserGroupController.php:307 msgid "Grupo actualizado" msgstr "Group updated" #: ../../../modules/api/Controllers/UserGroupController.php:151 #: ../../../modules/api/Controllers/UserGroupController.php:156 -#: ../../../modules/web/Controllers/UserGroupController.php:227 -#: ../../../modules/web/Controllers/UserGroupController.php:231 +#: ../../../modules/web/Controllers/UserGroupController.php:230 +#: ../../../modules/web/Controllers/UserGroupController.php:234 msgid "Grupo eliminado" msgstr "Group deleted" @@ -2725,9 +2726,9 @@ msgstr "Link viewed" #: ../../../modules/web/Controllers/AccountFileController.php:233 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:111 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:146 -#: ../../../modules/web/Controllers/AccountManagerController.php:114 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:103 +#: ../../../modules/web/Controllers/AccountManagerController.php:136 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:107 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:15 #: ../../../modules/web/themes/material-blue/views/account/account.inc:24 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:16 @@ -2762,12 +2763,12 @@ msgstr "Edit Account" #. (itstool) path: action/text #: ../../../modules/web/Controllers/AccountController.php:389 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:312 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:313 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:145 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:146 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:172 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:173 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:334 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:335 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:156 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:157 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:176 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:177 #: ../../../config/actions.xml:169 ../../../config/actions.xml:487 #: ../../../config/actions.xml:787 msgid "Eliminar Cuenta" @@ -2795,8 +2796,8 @@ msgstr "Account restored" #: ../../../modules/web/Controllers/AccountController.php:872 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:99 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:102 -#: ../../../modules/web/Controllers/AccountManagerController.php:99 -#: ../../../modules/web/Controllers/AccountManagerController.php:102 +#: ../../../modules/web/Controllers/AccountManagerController.php:121 +#: ../../../modules/web/Controllers/AccountManagerController.php:124 msgid "Cuentas eliminadas" msgstr "Accounts removed" @@ -2810,11 +2811,11 @@ msgid "Solicitante" msgstr "Requester" #: ../../../modules/web/Controllers/AccountController.php:920 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:101 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:105 #: ../../../modules/web/Controllers/Helpers/Grid/EventlogGrid.php:105 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:119 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:124 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:107 #: ../../../modules/web/themes/material-blue/views/itemshow/category.inc:28 #: ../../../modules/web/themes/material-blue/views/itemshow/client.inc:32 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:32 @@ -2896,7 +2897,7 @@ msgid "Archivo guardado" msgstr "File saved" #: ../../../modules/web/Controllers/AccountFileController.php:236 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:109 msgid "Tamaño" msgstr "Size" @@ -2922,14 +2923,14 @@ msgid "No hay archivos asociados a la cuenta" msgstr "There are no linked files for the account" #: ../../../modules/web/Controllers/AuthTokenController.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:150 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:151 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:154 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:155 msgid "Nueva Autorización" msgstr "New Authorization" #: ../../../modules/web/Controllers/AuthTokenController.php:165 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:185 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:186 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:189 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:190 msgid "Editar Autorización" msgstr "Edit Authorization" @@ -2957,17 +2958,17 @@ msgstr "Authorization viewed" #. (itstool) path: action/text #: ../../../modules/web/Controllers/CategoryController.php:104 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:147 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:148 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:110 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:151 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:152 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:112 #: ../../../config/actions.xml:307 msgid "Nueva Categoría" msgstr "New Category" #. (itstool) path: action/text #: ../../../modules/web/Controllers/CategoryController.php:167 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:165 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:166 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:169 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:170 #: ../../../config/actions.xml:313 msgid "Editar Categoría" msgstr "Edit Category" @@ -2985,17 +2986,17 @@ msgstr "View Category" #. (itstool) path: action/text #: ../../../modules/web/Controllers/ClientController.php:100 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:150 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:151 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:86 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:154 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:155 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:87 #: ../../../config/actions.xml:337 msgid "Nuevo Cliente" msgstr "New Client" #. (itstool) path: action/text #: ../../../modules/web/Controllers/ClientController.php:163 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:168 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:169 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:172 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:173 #: ../../../config/actions.xml:343 msgid "Editar Cliente" msgstr "Edit Client" @@ -3055,7 +3056,7 @@ msgid "Verificación de datos exportados finalizada" msgstr "Verification of exported data finished" #: ../../../modules/web/Controllers/ConfigBackupController.php:119 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:123 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:127 #: ../../../modules/web/themes/material-blue/views/common/aux-customfields.inc:13 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:86 msgid "Encriptado" @@ -3072,9 +3073,9 @@ msgid "No" msgstr "No" #: ../../../modules/web/Controllers/ConfigBackupController.php:123 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:89 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:203 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:93 #: ../../../modules/web/themes/material-blue/views/account/account.inc:205 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:207 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:309 msgid "Etiquetas" msgstr "Tags" @@ -3336,14 +3337,14 @@ msgid "DokuWiki deshabilitada" msgstr "DokuWiki disabled" #: ../../../modules/web/Controllers/CustomFieldController.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:154 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:155 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:158 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:159 msgid "Nuevo Campo" msgstr "New Field" #: ../../../modules/web/Controllers/CustomFieldController.php:162 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:172 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:173 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:176 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:177 msgid "Editar Campo" msgstr "Edit Field" @@ -3423,40 +3424,47 @@ msgid "Guardar" msgstr "Save" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:332 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:333 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:354 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:355 #: ../../../config/actions.xml:439 msgid "Actualizar Enlace Público" msgstr "Update Public Link" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:352 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:353 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:377 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:378 +#: ../../../config/actions.xml:433 +msgid "Eliminar Enlace Público" +msgstr "Delete Public Link" + +#. (itstool) path: action/text +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:397 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:398 #: ../../../config/actions.xml:421 msgid "Crear Enlace Público" msgstr "Create Public Link" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:373 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:374 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:418 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:419 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:463 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:464 #: ../../../modules/web/themes/material-blue/inc/Icons.php:34 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:64 #: ../../../config/actions.xml:175 ../../../config/actions.xml:265 msgid "Ver Clave" msgstr "View password" -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:395 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:396 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:440 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:441 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:485 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:486 msgid "Copiar Clave en Portapapeles" msgstr "Copy Password to Clipboard" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:463 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:464 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:508 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:509 #: ../../../config/actions.xml:193 msgid "Copiar Cuenta" msgstr "Copy Account" @@ -3493,7 +3501,7 @@ msgstr "Sort by Username" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:78 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:49 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:55 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:120 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:122 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:68 msgid "URL / IP" msgstr "URL / IP" @@ -3502,146 +3510,166 @@ msgstr "URL / IP" msgid "Ordenar por URL / IP" msgstr "Sort by URL / IP" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:67 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:68 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:71 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:70 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:69 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:70 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:69 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:72 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:70 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:74 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:72 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:72 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:72 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:72 #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:74 #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:75 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:83 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:71 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:70 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:80 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:71 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:86 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:87 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:74 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:72 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:82 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:83 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:74 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:74 msgid "Eliminar Seleccionados" msgstr "Delete Selected" +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:108 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:157 +#: ../../../modules/web/themes/material-blue/views/account/details.inc:37 +#: ../../../modules/web/themes/material-blue/views/account/details.inc:39 +msgid "Creador" +msgstr "Creator" + #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:130 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:140 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:141 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:144 #: ../../../config/actions.xml:493 ../../../config/actions.xml:793 msgid "Buscar Cuenta" msgstr "Search for Account" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:87 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:91 msgid "Cuentas (H)" msgstr "Accounts (H)" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:116 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:121 #: ../../../modules/web/Controllers/Helpers/Grid/TrackGrid.php:100 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:98 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:112 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:182 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:184 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:41 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:48 #: ../../../modules/web/themes/material-blue/views/wiki/wikipage.inc:24 msgid "Fecha" msgstr "Date" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:120 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:107 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:125 #: ../../../modules/web/Controllers/Helpers/Grid/PluginGrid.php:102 msgid "Estado" msgstr "Status" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:124 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:128 msgid "Modificada" msgstr "Modified" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:125 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:129 msgid "Eliminada" msgstr "Removed" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:155 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:156 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:159 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:160 #: ../../../config/actions.xml:187 ../../../config/actions.xml:799 msgid "Restaurar Cuenta" msgstr "Account Restore" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:94 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:357 msgid "Autorizaciones API" msgstr "API Authorizations" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:135 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:139 msgid "Buscar Token" msgstr "Search for Token" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:168 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:169 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:172 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:173 msgid "Ver token de Autorización" msgstr "View Authorization token" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:202 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:203 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:206 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:207 msgid "Eliminar Autorización" msgstr "Delete Authorization" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:132 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:136 #: ../../../config/actions.xml:325 msgid "Buscar Categoría" msgstr "Search for Category" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:182 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:183 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:186 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:187 #: ../../../config/actions.xml:319 msgid "Eliminar Categoría" msgstr "Delete Category" -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:118 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:122 #: ../../../config/strings.js.inc:66 msgid "SI" msgstr "YES" -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:118 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:122 #: ../../../config/strings.js.inc:67 msgid "NO" msgstr "NO" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:135 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:139 #: ../../../config/actions.xml:355 msgid "Buscar Cliente" msgstr "Search for Client" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:185 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:186 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:189 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:190 #: ../../../config/actions.xml:349 msgid "Eliminar Cliente" msgstr "Delete Client" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:94 #: ../../../modules/web/themes/material-blue/views/account/account.inc:27 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:341 msgid "Campos Personalizados" msgstr "Custom Fields" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:107 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:45 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:47 msgid "Módulo" msgstr "Module" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:105 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:115 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:109 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:119 msgid "Propiedades" msgstr "Properties" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:139 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:143 msgid "Buscar Campo" msgstr "Search for Field" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:189 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:190 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:193 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:194 msgid "Eliminar Campo" msgstr "Delete Field" @@ -3674,7 +3702,7 @@ msgid "Evento" msgstr "Event" #: ../../../modules/web/Controllers/Helpers/Grid/EventlogGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:112 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:116 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:44 #: ../../../modules/web/themes/material-blue/views/itemshow/user_pass.inc:26 msgid "Login" @@ -3701,7 +3729,7 @@ msgid "Vaciar registro de eventos" msgstr "Clear the event log out" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:89 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:93 #: ../../../modules/web/themes/material-blue/views/account/account.inc:35 #: ../../../modules/web/themes/material-blue/views/config/accounts.inc:277 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:145 @@ -3711,30 +3739,30 @@ msgid "Archivos" msgstr "Files" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:140 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:144 #: ../../../config/actions.xml:475 msgid "Buscar Archivo" msgstr "Search for File" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:155 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:156 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:159 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:160 #: ../../../modules/web/themes/material-blue/views/account/files-list.inc:45 #: ../../../config/actions.xml:205 ../../../config/actions.xml:451 msgid "Ver Archivo" msgstr "View File" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:172 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:173 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:176 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:177 #: ../../../modules/web/themes/material-blue/views/account/files-list.inc:38 #: ../../../config/actions.xml:217 ../../../config/actions.xml:457 msgid "Descargar Archivo" msgstr "Download File" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:189 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:190 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:193 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:194 #: ../../../modules/web/themes/material-blue/views/account/files-list.inc:30 #: ../../../config/actions.xml:223 ../../../config/actions.xml:463 msgid "Eliminar Archivo" @@ -3745,7 +3773,7 @@ msgid "Valores Predeterminados" msgstr "Preset Values" #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:109 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:113 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:117 #: ../../../modules/web/Controllers/UserProfileController.php:216 #: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:60 #: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:62 @@ -3823,7 +3851,7 @@ msgid "Eliminar Valor" msgstr "Delete Value" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:108 #: ../../../modules/web/themes/material-blue/inc/Icons.php:65 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:105 #: ../../../modules/web/themes/material-blue/views/notification/index.inc:1 @@ -3831,60 +3859,60 @@ msgstr "Delete Value" msgid "Notificaciones" msgstr "Notifications" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:118 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:123 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:28 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:35 msgid "Componente" msgstr "Component" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:140 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:145 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:104 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:108 msgid "Leída" msgstr "Read" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:141 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:146 msgid "Sólo Admins" msgstr "Only Admins" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:158 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:163 #: ../../../config/actions.xml:835 msgid "Buscar Notificación" msgstr "Search for Notification" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:173 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:174 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:178 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:179 #: ../../../modules/web/Controllers/NotificationController.php:179 msgid "Nueva Notificación" msgstr "New Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:191 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:192 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:196 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:197 #: ../../../modules/web/Controllers/NotificationController.php:103 #: ../../../config/actions.xml:805 msgid "Ver Notificación" msgstr "View Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:221 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:222 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:226 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:227 #: ../../../config/actions.xml:829 msgid "Marcar Notificación" msgstr "Checkout Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:239 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:240 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:244 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:245 #: ../../../modules/web/Controllers/NotificationController.php:210 #: ../../../config/actions.xml:817 msgid "Editar Notificación" msgstr "Edit Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:256 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:257 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:261 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:262 #: ../../../config/actions.xml:823 msgid "Eliminar Notificación" msgstr "Delete Notification" @@ -3932,32 +3960,32 @@ msgstr "Disable" msgid "Restablecer Datos" msgstr "Reset Data" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:91 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:95 #: ../../../modules/web/themes/material-blue/views/account/account.inc:43 msgid "Enlaces" msgstr "Links" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:109 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:44 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:46 msgid "Fecha Creación" msgstr "Creation Date" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:110 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:182 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:52 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:54 msgid "Fecha Caducidad" msgstr "Expiry Date " -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:108 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:112 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:31 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:34 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:38 msgid "Notificar" msgstr "Notify" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:109 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:113 #: ../../../modules/web/themes/material-blue/views/account/details.inc:9 #: ../../../modules/web/themes/material-blue/views/account/details.inc:11 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:184 @@ -3966,57 +3994,57 @@ msgstr "Notify" msgid "Visitas" msgstr "Visits" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:144 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:148 msgid "Buscar Enlace" msgstr "Search for Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:159 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:160 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:163 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:164 msgid "Nuevo Enlace" msgstr "New Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:177 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:178 -#: ../../../modules/web/Controllers/PublicLinkController.php:336 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:181 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:182 +#: ../../../modules/web/Controllers/PublicLinkController.php:341 msgid "Ver Enlace" msgstr "View Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:193 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:194 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:197 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:198 msgid "Renovar Enlace" msgstr "Renew Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:210 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:211 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:214 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:215 msgid "Eliminar Enlace" msgstr "Delete Link" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:130 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:134 #: ../../../config/actions.xml:523 msgid "Buscar Etiqueta" msgstr "Search for Tag" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:145 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:146 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:149 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:150 #: ../../../modules/web/Controllers/TagController.php:103 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:217 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:220 #: ../../../config/actions.xml:499 msgid "Nueva Etiqueta" msgstr "New Tag" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:163 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:164 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:167 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:168 #: ../../../modules/web/Controllers/TagController.php:162 #: ../../../config/actions.xml:511 msgid "Editar Etiqueta" msgstr "Edit Tag" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:180 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:181 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:184 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:185 #: ../../../config/actions.xml:517 msgid "Eliminar Etiqueta" msgstr "Delete Tag" @@ -4040,47 +4068,47 @@ msgid "Buscar Track" msgstr "Search for track" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:151 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:155 #: ../../../config/actions.xml:595 msgid "Buscar Usuario" msgstr "Search for User" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:166 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:167 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:170 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:171 #: ../../../modules/web/Controllers/UserController.php:105 #: ../../../config/actions.xml:571 msgid "Nuevo Usuario" msgstr "New User" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:184 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:185 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:188 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:189 #: ../../../modules/web/Controllers/UserController.php:190 #: ../../../config/actions.xml:577 msgid "Editar Usuario" msgstr "Edit User" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:201 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:202 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:205 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:206 #: ../../../config/actions.xml:583 msgid "Eliminar Usuario" msgstr "Delete User" -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:218 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:219 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:222 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:223 #: ../../../modules/web/themes/material-blue/views/config/ldap.inc:457 msgid "Importar usuarios de LDAP" msgstr "Import users from LDAP" -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:236 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:237 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:240 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:241 msgid "Ver Detalles de Usuario" msgstr "View User Details" -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:253 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:254 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:257 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:258 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:62 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:120 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:126 @@ -4088,77 +4116,77 @@ msgid "Cambiar Clave de Usuario" msgstr "Change User's Password" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:133 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:137 #: ../../../config/actions.xml:625 msgid "Buscar Grupo" msgstr "Search for Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:148 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:149 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:152 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:153 #: ../../../modules/web/Controllers/UserGroupController.php:112 #: ../../../config/actions.xml:607 msgid "Nuevo Grupo" msgstr "New Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:166 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:167 -#: ../../../modules/web/Controllers/UserGroupController.php:327 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:170 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:171 +#: ../../../modules/web/Controllers/UserGroupController.php:330 #: ../../../config/actions.xml:601 msgid "Ver Grupo" msgstr "View Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:183 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:184 -#: ../../../modules/web/Controllers/UserGroupController.php:179 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:187 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:188 +#: ../../../modules/web/Controllers/UserGroupController.php:182 #: ../../../config/actions.xml:613 msgid "Editar Grupo" msgstr "Edit Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:200 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:201 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:204 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:205 #: ../../../config/actions.xml:619 msgid "Eliminar Grupo" msgstr "Delete Group" -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:94 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:277 msgid "Perfiles" msgstr "Profiles" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:131 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:135 #: ../../../config/actions.xml:655 msgid "Buscar Perfil" msgstr "Search for Profile" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:146 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:147 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:150 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:151 #: ../../../modules/web/Controllers/UserProfileController.php:100 #: ../../../config/actions.xml:637 msgid "Nuevo Perfil" msgstr "New Profile" -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:164 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:165 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:168 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:169 msgid "Ver Detalles de Perfil" msgstr "View Profile Details" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:181 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:182 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:185 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:186 #: ../../../modules/web/Controllers/UserProfileController.php:166 #: ../../../config/actions.xml:643 msgid "Editar Perfil" msgstr "Edit Profile" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:198 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:199 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:202 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:203 #: ../../../config/actions.xml:649 msgid "Eliminar Perfil" msgstr "Delete Profile" @@ -4273,26 +4301,26 @@ msgstr "Plugin disabled" msgid "Plugin restablecido" msgstr "Plugin reset" -#: ../../../modules/web/Controllers/PublicLinkController.php:104 +#: ../../../modules/web/Controllers/PublicLinkController.php:109 msgid "Nuevo Enlace Público" msgstr "New Public Link" -#: ../../../modules/web/Controllers/PublicLinkController.php:191 +#: ../../../modules/web/Controllers/PublicLinkController.php:196 msgid "Editar Enlace Público" msgstr "Edit Public Link" -#: ../../../modules/web/Controllers/PublicLinkController.php:229 -#: ../../../modules/web/Controllers/PublicLinkController.php:232 +#: ../../../modules/web/Controllers/PublicLinkController.php:234 +#: ../../../modules/web/Controllers/PublicLinkController.php:237 msgid "Enlaces eliminados" msgstr "Links deleted" -#: ../../../modules/web/Controllers/PublicLinkController.php:240 -#: ../../../modules/web/Controllers/PublicLinkController.php:244 +#: ../../../modules/web/Controllers/PublicLinkController.php:245 +#: ../../../modules/web/Controllers/PublicLinkController.php:249 msgid "Enlace eliminado" msgstr "Link deleted" -#: ../../../modules/web/Controllers/PublicLinkController.php:270 -#: ../../../modules/web/Controllers/PublicLinkController.php:305 +#: ../../../modules/web/Controllers/PublicLinkController.php:275 +#: ../../../modules/web/Controllers/PublicLinkController.php:310 msgid "Enlace creado" msgstr "Link created" @@ -4377,8 +4405,8 @@ msgstr "User updated" msgid "Ver Usuario" msgstr "View User" -#: ../../../modules/web/Controllers/UserGroupController.php:216 #: ../../../modules/web/Controllers/UserGroupController.php:219 +#: ../../../modules/web/Controllers/UserGroupController.php:222 msgid "Grupos eliminados" msgstr "Groups deleted" @@ -4566,8 +4594,8 @@ msgstr "View Details" #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:68 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:134 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:138 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:24 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:63 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:43 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:84 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:97 msgid "Editar" msgstr "Edit" @@ -4790,14 +4818,14 @@ msgstr "Select Profile" #: ../../../config/strings.js.inc:50 #: ../../../modules/web/themes/material-blue/views/account/account.inc:78 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:60 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:24 msgid "Seleccionar Cliente" msgstr "Select Client" #: ../../../config/strings.js.inc:51 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:68 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:102 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:69 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:103 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:33 msgid "Seleccionar Categoría" msgstr "Select Category" @@ -4908,7 +4936,7 @@ msgid "Mostrar Favoritos" msgstr "Show Favorites" #: ../../../config/strings.js.inc:78 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:83 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:61 msgid "Mostrar Todos" msgstr "Show All" @@ -5025,14 +5053,70 @@ msgstr "Help :: FAQ :: Changelog" msgid "Un proyecto de cygnux.org" msgstr "A cygnux.org project" +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:8 +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:12 +msgid "Parámetros especiales" +msgstr "Special parameters" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:14 +msgid "" +"Es posible utilizar uno o varios parámetros especiales separados por espacios" +msgstr "" +"You could use either one or several special parameters separated by blank " +"spaces" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:16 +msgid "Buscar cuentas a las que 'login' tenga acceso" +msgstr "Search for accounts which 'login' has access rights" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:17 +msgid "Devolver las cuentas en las que 'login' es propietario" +msgstr "Get the accounts in which the user login \"login\" is the owner" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:18 +msgid "Buscar cuentas a las que 'group_name' tenga acceso" +msgstr "Search for accounts which 'group_name' has access rights" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:19 +msgid "Devolver las cuentas con grupo principal 'group_name'" +msgstr "Get the accounts which have the main group name \"group_name\"" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:20 +msgid "Buscar cuentas con archivos con el nombre 'file_name'" +msgstr "Search for accounts which contains a file with the name 'file_name'" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:21 +msgid "Buscar cuentas por nombre de cliente" +msgstr "Search accounts by client name" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:22 +msgid "Buscar cuentas por nombre de categoría" +msgstr "Search accounts by category name" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:23 +msgid "Devolver la cuenta con ID" +msgstr "Returns the account for the given ID" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:24 +msgid "Buscar cuentas con la clave caducada" +msgstr "Search for accounts with expired password" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:25 +msgid "Devolver las cuentas privadas del usuario actual" +msgstr "Get the private accounts for the current user" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:26 +msgid "Operador para los parámetros especiales" +msgstr "Operator for special parameters" + #: ../../../modules/web/themes/material-blue/views/_partials/no_records_found.inc:4 #: ../../../modules/web/themes/material-blue/views/account/search-index.inc:11 msgid "No se encontraron registros" msgstr "No records found" #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:77 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:160 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:167 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:162 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:169 #: ../../../modules/web/themes/material-blue/views/install/index.inc:61 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:108 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:115 @@ -5043,7 +5127,7 @@ msgid "Clave (repetir)" msgstr "Password (repeat)" #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:101 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:186 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:188 msgid "Seleccionar Fecha" msgstr "Select date" @@ -5059,7 +5143,7 @@ msgstr "Details" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:117 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:71 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:192 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:194 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:156 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:162 msgid "Notas" @@ -5067,18 +5151,18 @@ msgstr "Notes" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:129 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:131 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:253 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:255 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:262 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:264 msgid "Historial" msgstr "History" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:136 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:260 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:269 msgid "Seleccionar fecha" msgstr "Select date" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:147 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:272 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:281 #: ../../../modules/web/themes/material-blue/views/account/details.inc:27 #: ../../../modules/web/themes/material-blue/views/account/details.inc:29 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:284 @@ -5088,9 +5172,9 @@ msgstr "Last Modification" #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:22 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:54 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:12 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:28 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:51 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:15 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:32 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:52 msgid "Seleccionar Usuarios" msgstr "Select Users" @@ -5098,25 +5182,19 @@ msgstr "Select Users" #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:36 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:102 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:106 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:8 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:47 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:26 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:67 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:48 msgid "Ver" msgstr "View" #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:92 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:124 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:51 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:67 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:56 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:73 msgid "Seleccionar Grupos" msgstr "Select Groups" -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:157 -#: ../../../modules/web/themes/material-blue/views/account/details.inc:37 -#: ../../../modules/web/themes/material-blue/views/account/details.inc:39 -msgid "Creador" -msgstr "Creator" - #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:174 #: ../../../modules/web/themes/material-blue/views/account/details.inc:45 #: ../../../modules/web/themes/material-blue/views/account/details.inc:47 @@ -5155,25 +5233,25 @@ msgstr "Send" msgid "Permisos" msgstr "Permissions" -#: ../../../modules/web/themes/material-blue/views/account/account.inc:210 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:212 msgid "Seleccionar Etiquetas" msgstr "Select Tags" -#: ../../../modules/web/themes/material-blue/views/account/account.inc:246 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:255 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:21 msgid "Seleccionar Cuenta" msgstr "Select Account" -#: ../../../modules/web/themes/material-blue/views/account/account.inc:279 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:281 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:284 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:288 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:290 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:293 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:180 msgid "Enlace Público" msgstr "Public Link" -#: ../../../modules/web/themes/material-blue/views/account/account.inc:292 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:294 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:297 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:301 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:303 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:306 msgid "Enlace Directo" msgstr "Direct Link" @@ -5240,74 +5318,26 @@ msgstr "Link to Wiki" msgid "Ver en Wiki" msgstr "View at Wiki" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:25 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:30 -msgid "Parámetros especiales" -msgstr "Special parameters" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:32 -msgid "" -"Es posible utilizar uno o varios parámetros especiales separados por espacios" -msgstr "" -"You could use either one or several special parameters separated by blank " -"spaces" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:34 -msgid "Buscar cuentas a las que 'login' tenga acceso" -msgstr "Search for accounts which 'login' has access rights" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:35 -msgid "Devolver las cuentas en las que 'login' es propietario" -msgstr "Get the accounts in which the user login \"login\" is the owner" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:36 -msgid "Buscar cuentas a las que 'group_name' tenga acceso" -msgstr "Search for accounts which 'group_name' has access rights" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:37 -msgid "Devolver las cuentas con grupo principal 'group_name'" -msgstr "Get the accounts which have the main group name \"group_name\"" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:38 -msgid "Buscar cuentas con archivos con el nombre 'file_name'" -msgstr "Search for accounts which contains a file with the name 'file_name'" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:39 -msgid "Devolver la cuenta con ID" -msgstr "Returns the account for the given ID" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:40 -msgid "Buscar cuentas con la clave caducada" -msgstr "Search for accounts with expired password" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:41 -msgid "Devolver las cuentas privadas del usuario actual" -msgstr "Get the private accounts for the current user" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:42 -msgid "Operador para los parámetros especiales" -msgstr "Operator for special parameters" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:50 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:54 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:47 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:51 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:225 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:226 msgid "Búsqueda global" msgstr "Global searching" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:86 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:64 msgid "Filtrar Favoritos" msgstr "Favorites Filtering" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:100 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:79 msgid "Cuentas por página" msgstr "Accounts per page" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:106 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:85 msgid "Más Filtros" msgstr "More Filters" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:111 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:90 msgid "Seleccionar Etiqueta" msgstr "Select Tag" @@ -6702,14 +6732,14 @@ msgstr "Master Password Date" msgid "Usado en" msgstr "Used in" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:67 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:69 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:82 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:84 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:543 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:545 msgid "Usado por" msgstr "Used by" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:87 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:102 msgid "(*) Incluido en grupo" msgstr "(*) Listed in group" @@ -7281,11 +7311,6 @@ msgstr "Search for Custom Field" msgid "Ver Enlace Público" msgstr "Show Public Link" -#. (itstool) path: action/text -#: ../../../config/actions.xml:433 -msgid "Eliminar Enlace Público" -msgstr "Delete Public Link" - #. (itstool) path: action/text #: ../../../config/actions.xml:445 msgid "Buscar Enlace Público" diff --git a/app/locales/en_US/LC_MESSAGES/messages.mo b/app/locales/en_US/LC_MESSAGES/messages.mo index 0cc9999caac768c52d89485e5a1c395ae05029d8..1eeecfc70fe42a6e040962bb13ef83246d2188b4 100644 GIT binary patch delta 30028 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 MvbXd9c%{Dge`=%_w*UYD delta 29890 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 diff --git a/app/locales/en_US/LC_MESSAGES/messages.po b/app/locales/en_US/LC_MESSAGES/messages.po index 7d2b5c92..02162d44 100644 --- a/app/locales/en_US/LC_MESSAGES/messages.po +++ b/app/locales/en_US/LC_MESSAGES/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: sysPass\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-06 12:40+0200\n" -"PO-Revision-Date: 2018-10-06 12:40+0200\n" +"POT-Creation-Date: 2018-10-11 00:16+0200\n" +"PO-Revision-Date: 2018-10-11 00:16+0200\n" "Last-Translator: nuxsmin \n" "Language-Team: nuxsmin@syspass.org\n" "Language: en_US\n" @@ -25,12 +25,12 @@ msgstr "" "X-Poedit-SearchPath-1: ../../../../lib\n" "X-Poedit-SearchPath-2: ../../../config\n" -#: ../../../../lib/SP/Bootstrap.php:265 +#: ../../../../lib/SP/Bootstrap.php:267 #, php-format msgid "Versión de PHP requerida >= %s <= %s" msgstr "Required PHP version >= %s <= %s" -#: ../../../../lib/SP/Bootstrap.php:267 +#: ../../../../lib/SP/Bootstrap.php:269 msgid "" "Actualice la versión de PHP para que la aplicación funcione correctamente" msgstr "Please update the PHP version to run sysPass" @@ -84,7 +84,7 @@ msgid "Acceso denegado" msgstr "Access denied" #: ../../../../lib/SP/Core/Acl/Acl.php:300 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:107 #: ../../../modules/web/themes/material-blue/views/itemshow/auth_token.inc:30 #: ../../../modules/web/themes/material-blue/views/itemshow/auth_token.inc:32 msgid "Acción" @@ -104,9 +104,9 @@ msgstr "Action" #: ../../../../lib/SP/Services/Auth/LoginService.php:593 #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:238 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:235 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:102 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:106 #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:107 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:107 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:111 #: ../../../modules/web/Controllers/Helpers/Grid/TrackGrid.php:105 #: ../../../modules/web/Controllers/LoginController.php:102 #: ../../../modules/web/Controllers/UserController.php:278 @@ -119,7 +119,7 @@ msgstr "Action" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:91 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:60 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:66 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:133 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:135 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:63 #: ../../../modules/web/themes/material-blue/views/account/viewpass.inc:20 #: ../../../modules/web/themes/material-blue/views/config/general-proxy.inc:65 @@ -137,7 +137,7 @@ msgstr "Action" #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:60 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:62 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:11 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:76 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:91 #: ../../../modules/web/themes/material-blue/views/login/index.inc:15 #: ../../../modules/web/themes/material-blue/views/login/index.inc:84 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:68 @@ -154,7 +154,7 @@ msgstr "Action not found" #: ../../../../lib/SP/Util/ErrorUtil.php:140 #: ../../../modules/web/Controllers/AccountFileController.php:261 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:59 -#: ../../../modules/web/Controllers/AccountManagerController.php:57 +#: ../../../modules/web/Controllers/AccountManagerController.php:67 #: ../../../modules/web/Controllers/AuthTokenController.php:65 #: ../../../modules/web/Controllers/AuthTokenController.php:97 #: ../../../modules/web/Controllers/AuthTokenController.php:162 @@ -201,14 +201,14 @@ msgstr "Action not found" #: ../../../modules/web/Controllers/NotificationController.php:348 #: ../../../modules/web/Controllers/PluginController.php:98 #: ../../../modules/web/Controllers/PluginController.php:117 -#: ../../../modules/web/Controllers/PublicLinkController.php:68 -#: ../../../modules/web/Controllers/PublicLinkController.php:100 -#: ../../../modules/web/Controllers/PublicLinkController.php:162 -#: ../../../modules/web/Controllers/PublicLinkController.php:188 -#: ../../../modules/web/Controllers/PublicLinkController.php:218 -#: ../../../modules/web/Controllers/PublicLinkController.php:259 -#: ../../../modules/web/Controllers/PublicLinkController.php:291 -#: ../../../modules/web/Controllers/PublicLinkController.php:333 +#: ../../../modules/web/Controllers/PublicLinkController.php:71 +#: ../../../modules/web/Controllers/PublicLinkController.php:105 +#: ../../../modules/web/Controllers/PublicLinkController.php:167 +#: ../../../modules/web/Controllers/PublicLinkController.php:193 +#: ../../../modules/web/Controllers/PublicLinkController.php:223 +#: ../../../modules/web/Controllers/PublicLinkController.php:264 +#: ../../../modules/web/Controllers/PublicLinkController.php:296 +#: ../../../modules/web/Controllers/PublicLinkController.php:338 #: ../../../modules/web/Controllers/TagController.php:65 #: ../../../modules/web/Controllers/TagController.php:99 #: ../../../modules/web/Controllers/TagController.php:159 @@ -227,11 +227,11 @@ msgstr "Action not found" #: ../../../modules/web/Controllers/UserController.php:435 #: ../../../modules/web/Controllers/UserGroupController.php:74 #: ../../../modules/web/Controllers/UserGroupController.php:108 -#: ../../../modules/web/Controllers/UserGroupController.php:176 -#: ../../../modules/web/Controllers/UserGroupController.php:206 -#: ../../../modules/web/Controllers/UserGroupController.php:246 -#: ../../../modules/web/Controllers/UserGroupController.php:285 -#: ../../../modules/web/Controllers/UserGroupController.php:324 +#: ../../../modules/web/Controllers/UserGroupController.php:179 +#: ../../../modules/web/Controllers/UserGroupController.php:209 +#: ../../../modules/web/Controllers/UserGroupController.php:249 +#: ../../../modules/web/Controllers/UserGroupController.php:288 +#: ../../../modules/web/Controllers/UserGroupController.php:327 #: ../../../modules/web/Controllers/UserProfileController.php:64 #: ../../../modules/web/Controllers/UserProfileController.php:96 #: ../../../modules/web/Controllers/UserProfileController.php:163 @@ -291,7 +291,7 @@ msgstr "Session cannot be initialized" #: ../../../../lib/SP/Services/CustomField/CustomFieldService.php:203 #: ../../../../lib/SP/Services/Export/XmlVerifyService.php:108 #: ../../../../lib/SP/Services/Import/XmlFileImport.php:79 -#: ../../../../lib/SP/Services/User/UserPassService.php:229 +#: ../../../../lib/SP/Services/User/UserPassService.php:232 #: ../../../modules/web/Controllers/Traits/ItemTrait.php:122 #: ../../../modules/web/Controllers/Traits/ItemTrait.php:177 msgid "Error interno" @@ -328,7 +328,7 @@ msgstr "ON" msgid "OFF" msgstr "OFF" -#: ../../../../lib/SP/Html/DataGrid/DataGridBase.php:306 +#: ../../../../lib/SP/Html/DataGrid/DataGridBase.php:298 #: ../../../../lib/SP/Mvc/View/Template.php:122 #, php-format msgid "No es posible obtener la plantilla \"%s\" : %s" @@ -431,7 +431,7 @@ msgstr "New Plugin" #: ../../../modules/api/Controllers/AccountController.php:139 #: ../../../modules/api/Controllers/AccountController.php:188 #: ../../../modules/api/Controllers/AccountController.php:237 -#: ../../../modules/api/Controllers/AccountController.php:310 +#: ../../../modules/api/Controllers/AccountController.php:312 #: ../../../modules/api/Controllers/CategoryController.php:63 #: ../../../modules/api/Controllers/CategoryController.php:92 #: ../../../modules/api/Controllers/CategoryController.php:122 @@ -449,18 +449,18 @@ msgstr "New Plugin" #: ../../../modules/api/Controllers/UserGroupController.php:123 #: ../../../modules/api/Controllers/UserGroupController.php:152 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:221 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:98 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:99 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:100 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:111 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:102 -#: ../../../modules/web/Controllers/UserGroupController.php:262 -#: ../../../modules/web/Controllers/UserGroupController.php:301 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:107 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:115 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:106 +#: ../../../modules/web/Controllers/UserGroupController.php:265 +#: ../../../modules/web/Controllers/UserGroupController.php:304 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:22 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:33 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:15 @@ -500,9 +500,10 @@ msgstr "Error while searching the group RDN" #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:111 #: ../../../../lib/SP/Providers/Auth/Ldap/LdapStd.php:143 #: ../../../../lib/SP/Services/Ldap/LdapImportService.php:140 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:109 #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:108 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:114 -#: ../../../modules/web/Controllers/UserGroupController.php:228 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:118 +#: ../../../modules/web/Controllers/UserGroupController.php:231 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:137 #: ../../../modules/web/themes/material-blue/views/_partials/footer.inc:15 #: ../../../modules/web/themes/material-blue/views/config/encryption.inc:269 @@ -603,7 +604,7 @@ msgstr "Request" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:74 #: ../../../modules/web/Controllers/ConfigBackupController.php:120 #: ../../../modules/web/Controllers/ConfigManagerController.php:171 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:86 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:93 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:20 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:389 #: ../../../config/actions.xml:13 @@ -665,7 +666,7 @@ msgid "Error al modificar la cuenta" msgstr "Error while updating the account" #: ../../../../lib/SP/Repositories/Account/AccountRepository.php:405 -#: ../../../../lib/SP/Repositories/Account/AccountRepository.php:571 +#: ../../../../lib/SP/Repositories/Account/AccountRepository.php:576 #: ../../../../lib/SP/Services/Account/AccountHistoryService.php:75 msgid "No se pudieron obtener los datos de la cuenta" msgstr "Error while retrieving the account data" @@ -894,7 +895,7 @@ msgstr "Error while renewing link" #: ../../../../lib/SP/Repositories/PublicLink/PublicLinkRepository.php:465 #: ../../../../lib/SP/Repositories/PublicLink/PublicLinkRepository.php:506 -#: ../../../../lib/SP/Repositories/PublicLink/PublicLinkRepository.php:526 +#: ../../../../lib/SP/Repositories/PublicLink/PublicLinkRepository.php:527 msgid "Error al obtener enlace" msgstr "Error while retrieving the link" @@ -1191,10 +1192,10 @@ msgstr "The Master Password either is not saved or is wrong" #: ../../../../lib/SP/Services/Auth/LoginService.php:549 #: ../../../../lib/SP/Services/Auth/LoginService.php:592 #: ../../../modules/web/Controllers/AccountFileController.php:235 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:104 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:108 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:108 #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:106 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:117 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:122 #: ../../../modules/web/Controllers/ItemPresetController.php:306 #: ../../../modules/web/Controllers/ItemPresetController.php:345 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:31 @@ -1380,33 +1381,33 @@ msgstr "Error while updating the custom fields data" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:75 #: ../../../modules/web/Controllers/ConfigBackupController.php:122 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:89 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:93 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:293 msgid "Categorías" msgstr "Categories" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:76 #: ../../../modules/web/Controllers/ConfigBackupController.php:121 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:88 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:92 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:325 msgid "Clientes" msgstr "Clients" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:77 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:99 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:103 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:14 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:4 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:9 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:45 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:47 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:50 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:51 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:245 msgid "Usuarios" msgstr "Users" #: ../../../../lib/SP/Services/CustomField/CustomFieldDefService.php:78 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:94 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:84 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:43 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:50 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:261 msgid "Grupos" msgstr "Groups" @@ -1500,7 +1501,7 @@ msgstr "Account imported" #: ../../../modules/api/Controllers/AccountController.php:140 #: ../../../modules/api/Controllers/AccountController.php:189 #: ../../../modules/api/Controllers/AccountController.php:238 -#: ../../../modules/api/Controllers/AccountController.php:311 +#: ../../../modules/api/Controllers/AccountController.php:313 #: ../../../modules/web/Controllers/AccountController.php:225 #: ../../../modules/web/Controllers/AccountController.php:710 #: ../../../modules/web/Controllers/AccountController.php:755 @@ -1511,15 +1512,15 @@ msgstr "Account imported" #: ../../../modules/web/Controllers/AccountFileController.php:234 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:112 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:147 -#: ../../../modules/web/Controllers/AccountManagerController.php:115 +#: ../../../modules/web/Controllers/AccountManagerController.php:137 #: ../../../modules/web/Controllers/ClientController.php:213 #: ../../../modules/web/Controllers/ClientController.php:245 #: ../../../modules/web/Controllers/ClientController.php:281 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:214 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:99 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:100 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:104 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:108 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:33 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:39 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:47 @@ -1610,14 +1611,14 @@ msgstr "Category imported" #: ../../../modules/web/Controllers/CategoryController.php:254 #: ../../../modules/web/Controllers/CategoryController.php:294 #: ../../../modules/web/Controllers/Helpers/Account/AccountSearchHelper.php:228 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:100 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:101 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:107 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:105 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:62 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:64 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:38 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:44 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:96 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:98 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:97 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:99 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:57 msgid "Categoría" msgstr "Category" @@ -2100,12 +2101,12 @@ msgid "Actualización de enlaces públicos" msgstr "Public links update" #: ../../../../lib/SP/Services/Upgrade/UpgradePublicLink.php:89 -#: ../../../modules/web/Controllers/PublicLinkController.php:170 +#: ../../../modules/web/Controllers/PublicLinkController.php:175 msgid "Enlace actualizado" msgstr "Link updated" #: ../../../../lib/SP/Services/Upgrade/UpgradePublicLink.php:90 -#: ../../../modules/web/Controllers/PublicLinkController.php:241 +#: ../../../modules/web/Controllers/PublicLinkController.php:246 msgid "Enlace" msgstr "Link" @@ -2117,7 +2118,7 @@ msgstr "Link" msgid "Reinicie la sesión para cambiarla" msgstr "Please, restart the session for update it" -#: ../../../../lib/SP/Services/User/UserPassService.php:253 +#: ../../../../lib/SP/Services/User/UserPassService.php:256 #: ../../../../lib/SP/Services/User/UserService.php:123 #: ../../../../lib/SP/Services/User/UserService.php:154 #: ../../../../lib/SP/Services/User/UserService.php:173 @@ -2325,14 +2326,14 @@ msgstr "Account added" msgid "Cuenta actualizada" msgstr "Account updated" -#: ../../../modules/api/Controllers/AccountController.php:309 -#: ../../../modules/api/Controllers/AccountController.php:315 +#: ../../../modules/api/Controllers/AccountController.php:311 +#: ../../../modules/api/Controllers/AccountController.php:317 #: ../../../modules/web/Controllers/AccountController.php:883 #: ../../../modules/web/Controllers/AccountController.php:888 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:110 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:115 -#: ../../../modules/web/Controllers/AccountManagerController.php:113 -#: ../../../modules/web/Controllers/AccountManagerController.php:118 +#: ../../../modules/web/Controllers/AccountManagerController.php:135 +#: ../../../modules/web/Controllers/AccountManagerController.php:140 msgid "Cuenta eliminada" msgstr "Account removed" @@ -2434,8 +2435,8 @@ msgstr "Send details in the response" #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:82 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:85 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:93 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:147 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:155 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:149 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:157 #: ../../../modules/web/themes/material-blue/views/account/viewpass.inc:37 #: ../../../modules/web/themes/material-blue/views/config/encryption.inc:288 #: ../../../modules/web/themes/material-blue/views/config/encryption.inc:291 @@ -2463,7 +2464,7 @@ msgstr "Password" #: ../../../modules/api/Controllers/Help/AccountHelp.php:113 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:89 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:104 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:173 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:175 #: ../../../modules/web/themes/material-blue/views/account/details.inc:83 #: ../../../modules/web/themes/material-blue/views/account/details.inc:85 msgid "Fecha Caducidad Clave" @@ -2498,14 +2499,14 @@ msgstr "Client Id" #: ../../../modules/api/Controllers/Help/AccountHelp.php:86 #: ../../../modules/api/Controllers/Help/AccountHelp.php:108 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:99 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:141 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:143 msgid "Usuario de acceso" msgstr "Access user" #: ../../../modules/api/Controllers/Help/AccountHelp.php:87 #: ../../../modules/api/Controllers/Help/AccountHelp.php:109 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:86 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:128 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:130 msgid "URL o IP de acceso" msgstr "Access URL or IP" @@ -2513,7 +2514,7 @@ msgstr "Access URL or IP" #: ../../../modules/api/Controllers/Help/AccountHelp.php:110 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:124 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:78 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:199 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:201 msgid "Notas sobre la cuenta" msgstr "Notes about the account" @@ -2534,8 +2535,8 @@ msgstr "Private Account for Group" #: ../../../modules/api/Controllers/Help/AccountHelp.php:92 #: ../../../modules/api/Controllers/Help/AccountHelp.php:114 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:236 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:238 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:245 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:247 #: ../../../modules/web/themes/material-blue/views/account/viewpass.inc:8 msgid "Cuenta Vinculada" msgstr "Linked Account" @@ -2604,8 +2605,8 @@ msgstr "Client description" #: ../../../modules/api/Controllers/Help/ClientHelp.php:56 #: ../../../modules/api/Controllers/Help/ClientHelp.php:70 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:142 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:147 #: ../../../modules/web/themes/material-blue/views/itemshow/client.inc:62 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:92 msgid "Global" @@ -2674,22 +2675,22 @@ msgstr "Group viewed" #: ../../../modules/api/Controllers/UserGroupController.php:91 #: ../../../modules/api/Controllers/UserGroupController.php:96 -#: ../../../modules/web/Controllers/UserGroupController.php:261 -#: ../../../modules/web/Controllers/UserGroupController.php:265 +#: ../../../modules/web/Controllers/UserGroupController.php:264 +#: ../../../modules/web/Controllers/UserGroupController.php:268 msgid "Grupo creado" msgstr "Group added" #: ../../../modules/api/Controllers/UserGroupController.php:122 #: ../../../modules/api/Controllers/UserGroupController.php:127 -#: ../../../modules/web/Controllers/UserGroupController.php:300 -#: ../../../modules/web/Controllers/UserGroupController.php:304 +#: ../../../modules/web/Controllers/UserGroupController.php:303 +#: ../../../modules/web/Controllers/UserGroupController.php:307 msgid "Grupo actualizado" msgstr "Group updated" #: ../../../modules/api/Controllers/UserGroupController.php:151 #: ../../../modules/api/Controllers/UserGroupController.php:156 -#: ../../../modules/web/Controllers/UserGroupController.php:227 -#: ../../../modules/web/Controllers/UserGroupController.php:231 +#: ../../../modules/web/Controllers/UserGroupController.php:230 +#: ../../../modules/web/Controllers/UserGroupController.php:234 msgid "Grupo eliminado" msgstr "Group deleted" @@ -2725,9 +2726,9 @@ msgstr "Link viewed" #: ../../../modules/web/Controllers/AccountFileController.php:233 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:111 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:146 -#: ../../../modules/web/Controllers/AccountManagerController.php:114 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:103 +#: ../../../modules/web/Controllers/AccountManagerController.php:136 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:107 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:15 #: ../../../modules/web/themes/material-blue/views/account/account.inc:24 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:16 @@ -2762,12 +2763,12 @@ msgstr "Edit Account" #. (itstool) path: action/text #: ../../../modules/web/Controllers/AccountController.php:389 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:312 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:313 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:145 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:146 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:172 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:173 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:334 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:335 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:156 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:157 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:176 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:177 #: ../../../config/actions.xml:169 ../../../config/actions.xml:487 #: ../../../config/actions.xml:787 msgid "Eliminar Cuenta" @@ -2795,8 +2796,8 @@ msgstr "Account restored" #: ../../../modules/web/Controllers/AccountController.php:872 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:99 #: ../../../modules/web/Controllers/AccountHistoryManagerController.php:102 -#: ../../../modules/web/Controllers/AccountManagerController.php:99 -#: ../../../modules/web/Controllers/AccountManagerController.php:102 +#: ../../../modules/web/Controllers/AccountManagerController.php:121 +#: ../../../modules/web/Controllers/AccountManagerController.php:124 msgid "Cuentas eliminadas" msgstr "Accounts removed" @@ -2810,11 +2811,11 @@ msgid "Solicitante" msgstr "Requester" #: ../../../modules/web/Controllers/AccountController.php:920 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:101 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:105 #: ../../../modules/web/Controllers/Helpers/Grid/EventlogGrid.php:105 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:119 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:124 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:107 #: ../../../modules/web/themes/material-blue/views/itemshow/category.inc:28 #: ../../../modules/web/themes/material-blue/views/itemshow/client.inc:32 #: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:32 @@ -2896,7 +2897,7 @@ msgid "Archivo guardado" msgstr "File saved" #: ../../../modules/web/Controllers/AccountFileController.php:236 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:109 msgid "Tamaño" msgstr "Size" @@ -2922,14 +2923,14 @@ msgid "No hay archivos asociados a la cuenta" msgstr "There are no linked files for the account" #: ../../../modules/web/Controllers/AuthTokenController.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:150 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:151 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:154 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:155 msgid "Nueva Autorización" msgstr "New Authorization" #: ../../../modules/web/Controllers/AuthTokenController.php:165 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:185 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:186 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:189 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:190 msgid "Editar Autorización" msgstr "Edit Authorization" @@ -2957,17 +2958,17 @@ msgstr "Authorization viewed" #. (itstool) path: action/text #: ../../../modules/web/Controllers/CategoryController.php:104 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:147 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:148 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:110 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:151 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:152 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:112 #: ../../../config/actions.xml:307 msgid "Nueva Categoría" msgstr "New Category" #. (itstool) path: action/text #: ../../../modules/web/Controllers/CategoryController.php:167 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:165 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:166 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:169 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:170 #: ../../../config/actions.xml:313 msgid "Editar Categoría" msgstr "Edit Category" @@ -2985,17 +2986,17 @@ msgstr "View Category" #. (itstool) path: action/text #: ../../../modules/web/Controllers/ClientController.php:100 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:150 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:151 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:86 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:154 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:155 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:87 #: ../../../config/actions.xml:337 msgid "Nuevo Cliente" msgstr "New Client" #. (itstool) path: action/text #: ../../../modules/web/Controllers/ClientController.php:163 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:168 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:169 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:172 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:173 #: ../../../config/actions.xml:343 msgid "Editar Cliente" msgstr "Edit Client" @@ -3055,7 +3056,7 @@ msgid "Verificación de datos exportados finalizada" msgstr "Verification of exported data finished" #: ../../../modules/web/Controllers/ConfigBackupController.php:119 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:123 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:127 #: ../../../modules/web/themes/material-blue/views/common/aux-customfields.inc:13 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:86 msgid "Encriptado" @@ -3072,9 +3073,9 @@ msgid "No" msgstr "No" #: ../../../modules/web/Controllers/ConfigBackupController.php:123 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:89 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:203 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:93 #: ../../../modules/web/themes/material-blue/views/account/account.inc:205 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:207 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:309 msgid "Etiquetas" msgstr "Tags" @@ -3336,14 +3337,14 @@ msgid "DokuWiki deshabilitada" msgstr "DokuWiki disabled" #: ../../../modules/web/Controllers/CustomFieldController.php:101 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:154 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:155 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:158 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:159 msgid "Nuevo Campo" msgstr "New Field" #: ../../../modules/web/Controllers/CustomFieldController.php:162 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:172 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:173 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:176 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:177 msgid "Editar Campo" msgstr "Edit Field" @@ -3423,40 +3424,47 @@ msgid "Guardar" msgstr "Save" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:332 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:333 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:354 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:355 #: ../../../config/actions.xml:439 msgid "Actualizar Enlace Público" msgstr "Update Public Link" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:352 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:353 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:377 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:378 +#: ../../../config/actions.xml:433 +msgid "Eliminar Enlace Público" +msgstr "Delete Public Link" + +#. (itstool) path: action/text +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:397 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:398 #: ../../../config/actions.xml:421 msgid "Crear Enlace Público" msgstr "Create Public Link" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:373 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:374 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:418 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:419 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:463 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:464 #: ../../../modules/web/themes/material-blue/inc/Icons.php:34 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:64 #: ../../../config/actions.xml:175 ../../../config/actions.xml:265 msgid "Ver Clave" msgstr "View password" -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:395 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:396 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:440 #: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:441 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:485 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:486 msgid "Copiar Clave en Portapapeles" msgstr "Copy Password to Clipboard" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:463 -#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:464 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:508 +#: ../../../modules/web/Controllers/Helpers/Account/AccountActionsHelper.php:509 #: ../../../config/actions.xml:193 msgid "Copiar Cuenta" msgstr "Copy Account" @@ -3493,7 +3501,7 @@ msgstr "Sort by Username" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:78 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:49 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:55 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:120 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:122 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:68 msgid "URL / IP" msgstr "URL / IP" @@ -3502,146 +3510,166 @@ msgstr "URL / IP" msgid "Ordenar por URL / IP" msgstr "Sort by URL / IP" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:67 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:68 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:71 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:70 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:69 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:70 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:69 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:72 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:70 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:74 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:72 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:72 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:72 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:72 #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:74 #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:75 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:83 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:71 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:70 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:80 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:71 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:71 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:86 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:87 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:74 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:72 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:82 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:83 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:74 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:73 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:74 msgid "Eliminar Seleccionados" msgstr "Delete Selected" +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:108 +#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:157 +#: ../../../modules/web/themes/material-blue/views/account/details.inc:37 +#: ../../../modules/web/themes/material-blue/views/account/details.inc:39 +msgid "Creador" +msgstr "Creator" + #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:130 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:140 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountGrid.php:141 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:144 #: ../../../config/actions.xml:493 ../../../config/actions.xml:793 msgid "Buscar Cuenta" msgstr "Search for Account" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:87 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:91 msgid "Cuentas (H)" msgstr "Accounts (H)" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:102 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:116 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:121 #: ../../../modules/web/Controllers/Helpers/Grid/TrackGrid.php:100 #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:98 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:112 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:182 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:184 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:41 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:48 #: ../../../modules/web/themes/material-blue/views/wiki/wikipage.inc:24 msgid "Fecha" msgstr "Date" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:120 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:107 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:125 #: ../../../modules/web/Controllers/Helpers/Grid/PluginGrid.php:102 msgid "Estado" msgstr "Status" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:124 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:128 msgid "Modificada" msgstr "Modified" -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:125 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:129 msgid "Eliminada" msgstr "Removed" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:155 -#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:156 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:159 +#: ../../../modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php:160 #: ../../../config/actions.xml:187 ../../../config/actions.xml:799 msgid "Restaurar Cuenta" msgstr "Account Restore" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:94 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:357 msgid "Autorizaciones API" msgstr "API Authorizations" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:135 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:139 msgid "Buscar Token" msgstr "Search for Token" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:168 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:169 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:172 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:173 msgid "Ver token de Autorización" msgstr "View Authorization token" -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:202 -#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:203 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:206 +#: ../../../modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php:207 msgid "Eliminar Autorización" msgstr "Delete Authorization" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:132 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:136 #: ../../../config/actions.xml:325 msgid "Buscar Categoría" msgstr "Search for Category" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:182 -#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:183 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:186 +#: ../../../modules/web/Controllers/Helpers/Grid/CategoryGrid.php:187 #: ../../../config/actions.xml:319 msgid "Eliminar Categoría" msgstr "Delete Category" -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:118 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:122 #: ../../../config/strings.js.inc:66 msgid "SI" msgstr "YES" -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:118 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:122 #: ../../../config/strings.js.inc:67 msgid "NO" msgstr "NO" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:135 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:139 #: ../../../config/actions.xml:355 msgid "Buscar Cliente" msgstr "Search for Client" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:185 -#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:186 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:189 +#: ../../../modules/web/Controllers/Helpers/Grid/ClientGrid.php:190 #: ../../../config/actions.xml:349 msgid "Eliminar Cliente" msgstr "Delete Client" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:94 #: ../../../modules/web/themes/material-blue/views/account/account.inc:27 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:341 msgid "Campos Personalizados" msgstr "Custom Fields" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:107 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:45 #: ../../../modules/web/themes/material-blue/views/itemshow/custom_field.inc:47 msgid "Módulo" msgstr "Module" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:105 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:115 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:109 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:119 msgid "Propiedades" msgstr "Properties" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:139 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:143 msgid "Buscar Campo" msgstr "Search for Field" -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:189 -#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:190 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:193 +#: ../../../modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php:194 msgid "Eliminar Campo" msgstr "Delete Field" @@ -3674,7 +3702,7 @@ msgid "Evento" msgstr "Event" #: ../../../modules/web/Controllers/Helpers/Grid/EventlogGrid.php:103 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:112 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:116 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:44 #: ../../../modules/web/themes/material-blue/views/itemshow/user_pass.inc:26 msgid "Login" @@ -3701,7 +3729,7 @@ msgid "Vaciar registro de eventos" msgstr "Clear the event log out" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:89 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:93 #: ../../../modules/web/themes/material-blue/views/account/account.inc:35 #: ../../../modules/web/themes/material-blue/views/config/accounts.inc:277 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:145 @@ -3711,30 +3739,30 @@ msgid "Archivos" msgstr "Files" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:140 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:144 #: ../../../config/actions.xml:475 msgid "Buscar Archivo" msgstr "Search for File" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:155 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:156 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:159 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:160 #: ../../../modules/web/themes/material-blue/views/account/files-list.inc:45 #: ../../../config/actions.xml:205 ../../../config/actions.xml:451 msgid "Ver Archivo" msgstr "View File" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:172 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:173 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:176 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:177 #: ../../../modules/web/themes/material-blue/views/account/files-list.inc:38 #: ../../../config/actions.xml:217 ../../../config/actions.xml:457 msgid "Descargar Archivo" msgstr "Download File" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:189 -#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:190 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:193 +#: ../../../modules/web/Controllers/Helpers/Grid/FileGrid.php:194 #: ../../../modules/web/themes/material-blue/views/account/files-list.inc:30 #: ../../../config/actions.xml:223 ../../../config/actions.xml:463 msgid "Eliminar Archivo" @@ -3745,7 +3773,7 @@ msgid "Valores Predeterminados" msgstr "Preset Values" #: ../../../modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php:109 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:113 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:117 #: ../../../modules/web/Controllers/UserProfileController.php:216 #: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:60 #: ../../../modules/web/themes/material-blue/views/itemshow/item_preset.inc:62 @@ -3823,7 +3851,7 @@ msgid "Eliminar Valor" msgstr "Delete Value" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:103 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:108 #: ../../../modules/web/themes/material-blue/inc/Icons.php:65 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:105 #: ../../../modules/web/themes/material-blue/views/notification/index.inc:1 @@ -3831,60 +3859,60 @@ msgstr "Delete Value" msgid "Notificaciones" msgstr "Notifications" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:118 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:123 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:28 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:35 msgid "Componente" msgstr "Component" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:140 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:145 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:104 #: ../../../modules/web/themes/material-blue/views/notification/notification.inc:108 msgid "Leída" msgstr "Read" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:141 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:146 msgid "Sólo Admins" msgstr "Only Admins" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:158 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:163 #: ../../../config/actions.xml:835 msgid "Buscar Notificación" msgstr "Search for Notification" -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:173 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:174 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:178 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:179 #: ../../../modules/web/Controllers/NotificationController.php:179 msgid "Nueva Notificación" msgstr "New Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:191 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:192 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:196 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:197 #: ../../../modules/web/Controllers/NotificationController.php:103 #: ../../../config/actions.xml:805 msgid "Ver Notificación" msgstr "View Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:221 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:222 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:226 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:227 #: ../../../config/actions.xml:829 msgid "Marcar Notificación" msgstr "Checkout Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:239 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:240 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:244 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:245 #: ../../../modules/web/Controllers/NotificationController.php:210 #: ../../../config/actions.xml:817 msgid "Editar Notificación" msgstr "Edit Notification" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:256 -#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:257 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:261 +#: ../../../modules/web/Controllers/Helpers/Grid/NotificationGrid.php:262 #: ../../../config/actions.xml:823 msgid "Eliminar Notificación" msgstr "Delete Notification" @@ -3932,32 +3960,32 @@ msgstr "Disable" msgid "Restablecer Datos" msgstr "Reset Data" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:91 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:95 #: ../../../modules/web/themes/material-blue/views/account/account.inc:43 msgid "Enlaces" msgstr "Links" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:105 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:109 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:44 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:46 msgid "Fecha Creación" msgstr "Creation Date" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:106 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:110 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:182 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:52 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:54 msgid "Fecha Caducidad" msgstr "Expiry Date " -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:108 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:112 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:31 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:34 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:38 msgid "Notificar" msgstr "Notify" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:109 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:113 #: ../../../modules/web/themes/material-blue/views/account/details.inc:9 #: ../../../modules/web/themes/material-blue/views/account/details.inc:11 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:184 @@ -3966,57 +3994,57 @@ msgstr "Notify" msgid "Visitas" msgstr "Visits" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:144 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:148 msgid "Buscar Enlace" msgstr "Search for Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:159 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:160 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:163 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:164 msgid "Nuevo Enlace" msgstr "New Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:177 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:178 -#: ../../../modules/web/Controllers/PublicLinkController.php:336 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:181 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:182 +#: ../../../modules/web/Controllers/PublicLinkController.php:341 msgid "Ver Enlace" msgstr "View Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:193 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:194 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:197 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:198 msgid "Renovar Enlace" msgstr "Renew Link" -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:210 -#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:211 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:214 +#: ../../../modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php:215 msgid "Eliminar Enlace" msgstr "Delete Link" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:130 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:134 #: ../../../config/actions.xml:523 msgid "Buscar Etiqueta" msgstr "Search for Tag" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:145 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:146 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:149 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:150 #: ../../../modules/web/Controllers/TagController.php:103 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:217 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:220 #: ../../../config/actions.xml:499 msgid "Nueva Etiqueta" msgstr "New Tag" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:163 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:164 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:167 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:168 #: ../../../modules/web/Controllers/TagController.php:162 #: ../../../config/actions.xml:511 msgid "Editar Etiqueta" msgstr "Edit Tag" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:180 -#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:181 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:184 +#: ../../../modules/web/Controllers/Helpers/Grid/TagGrid.php:185 #: ../../../config/actions.xml:517 msgid "Eliminar Etiqueta" msgstr "Delete Tag" @@ -4040,47 +4068,47 @@ msgid "Buscar Track" msgstr "Search for track" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:151 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:155 #: ../../../config/actions.xml:595 msgid "Buscar Usuario" msgstr "Search for User" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:166 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:167 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:170 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:171 #: ../../../modules/web/Controllers/UserController.php:105 #: ../../../config/actions.xml:571 msgid "Nuevo Usuario" msgstr "New User" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:184 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:185 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:188 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:189 #: ../../../modules/web/Controllers/UserController.php:190 #: ../../../config/actions.xml:577 msgid "Editar Usuario" msgstr "Edit User" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:201 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:202 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:205 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:206 #: ../../../config/actions.xml:583 msgid "Eliminar Usuario" msgstr "Delete User" -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:218 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:219 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:222 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:223 #: ../../../modules/web/themes/material-blue/views/config/ldap.inc:457 msgid "Importar usuarios de LDAP" msgstr "Import users from LDAP" -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:236 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:237 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:240 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:241 msgid "Ver Detalles de Usuario" msgstr "View User Details" -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:253 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:254 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:257 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGrid.php:258 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:62 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:120 #: ../../../modules/web/themes/material-blue/views/_partials/fixed-header.inc:126 @@ -4088,77 +4116,77 @@ msgid "Cambiar Clave de Usuario" msgstr "Change User's Password" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:133 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:137 #: ../../../config/actions.xml:625 msgid "Buscar Grupo" msgstr "Search for Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:148 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:149 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:152 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:153 #: ../../../modules/web/Controllers/UserGroupController.php:112 #: ../../../config/actions.xml:607 msgid "Nuevo Grupo" msgstr "New Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:166 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:167 -#: ../../../modules/web/Controllers/UserGroupController.php:327 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:170 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:171 +#: ../../../modules/web/Controllers/UserGroupController.php:330 #: ../../../config/actions.xml:601 msgid "Ver Grupo" msgstr "View Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:183 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:184 -#: ../../../modules/web/Controllers/UserGroupController.php:179 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:187 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:188 +#: ../../../modules/web/Controllers/UserGroupController.php:182 #: ../../../config/actions.xml:613 msgid "Editar Grupo" msgstr "Edit Group" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:200 -#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:201 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:204 +#: ../../../modules/web/Controllers/Helpers/Grid/UserGroupGrid.php:205 #: ../../../config/actions.xml:619 msgid "Eliminar Grupo" msgstr "Delete Group" -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:90 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:94 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:277 msgid "Perfiles" msgstr "Profiles" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:131 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:135 #: ../../../config/actions.xml:655 msgid "Buscar Perfil" msgstr "Search for Profile" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:146 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:147 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:150 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:151 #: ../../../modules/web/Controllers/UserProfileController.php:100 #: ../../../config/actions.xml:637 msgid "Nuevo Perfil" msgstr "New Profile" -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:164 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:165 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:168 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:169 msgid "Ver Detalles de Perfil" msgstr "View Profile Details" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:181 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:182 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:185 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:186 #: ../../../modules/web/Controllers/UserProfileController.php:166 #: ../../../config/actions.xml:643 msgid "Editar Perfil" msgstr "Edit Profile" #. (itstool) path: action/text -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:198 -#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:199 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:202 +#: ../../../modules/web/Controllers/Helpers/Grid/UserProfileGrid.php:203 #: ../../../config/actions.xml:649 msgid "Eliminar Perfil" msgstr "Delete Profile" @@ -4273,26 +4301,26 @@ msgstr "Plugin disabled" msgid "Plugin restablecido" msgstr "Plugin reset" -#: ../../../modules/web/Controllers/PublicLinkController.php:104 +#: ../../../modules/web/Controllers/PublicLinkController.php:109 msgid "Nuevo Enlace Público" msgstr "New Public Link" -#: ../../../modules/web/Controllers/PublicLinkController.php:191 +#: ../../../modules/web/Controllers/PublicLinkController.php:196 msgid "Editar Enlace Público" msgstr "Edit Public Link" -#: ../../../modules/web/Controllers/PublicLinkController.php:229 -#: ../../../modules/web/Controllers/PublicLinkController.php:232 +#: ../../../modules/web/Controllers/PublicLinkController.php:234 +#: ../../../modules/web/Controllers/PublicLinkController.php:237 msgid "Enlaces eliminados" msgstr "Links deleted" -#: ../../../modules/web/Controllers/PublicLinkController.php:240 -#: ../../../modules/web/Controllers/PublicLinkController.php:244 +#: ../../../modules/web/Controllers/PublicLinkController.php:245 +#: ../../../modules/web/Controllers/PublicLinkController.php:249 msgid "Enlace eliminado" msgstr "Link deleted" -#: ../../../modules/web/Controllers/PublicLinkController.php:270 -#: ../../../modules/web/Controllers/PublicLinkController.php:305 +#: ../../../modules/web/Controllers/PublicLinkController.php:275 +#: ../../../modules/web/Controllers/PublicLinkController.php:310 msgid "Enlace creado" msgstr "Link created" @@ -4377,8 +4405,8 @@ msgstr "User updated" msgid "Ver Usuario" msgstr "View User" -#: ../../../modules/web/Controllers/UserGroupController.php:216 #: ../../../modules/web/Controllers/UserGroupController.php:219 +#: ../../../modules/web/Controllers/UserGroupController.php:222 msgid "Grupos eliminados" msgstr "Groups deleted" @@ -4566,8 +4594,8 @@ msgstr "View Details" #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:68 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:134 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:138 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:24 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:63 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:43 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:84 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:97 msgid "Editar" msgstr "Edit" @@ -4790,14 +4818,14 @@ msgstr "Select Profile" #: ../../../config/strings.js.inc:50 #: ../../../modules/web/themes/material-blue/views/account/account.inc:78 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:60 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:24 msgid "Seleccionar Cliente" msgstr "Select Client" #: ../../../config/strings.js.inc:51 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:68 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:102 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:69 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:103 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:33 msgid "Seleccionar Categoría" msgstr "Select Category" @@ -4908,7 +4936,7 @@ msgid "Mostrar Favoritos" msgstr "Show Favorites" #: ../../../config/strings.js.inc:78 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:83 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:61 msgid "Mostrar Todos" msgstr "Show All" @@ -5025,14 +5053,70 @@ msgstr "Help :: FAQ :: Changelog" msgid "Un proyecto de cygnux.org" msgstr "A cygnux.org project" +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:8 +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:12 +msgid "Parámetros especiales" +msgstr "Special parameters" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:14 +msgid "" +"Es posible utilizar uno o varios parámetros especiales separados por espacios" +msgstr "" +"You could use either one or several special parameters separated by blank " +"spaces" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:16 +msgid "Buscar cuentas a las que 'login' tenga acceso" +msgstr "Search for accounts which 'login' has access rights" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:17 +msgid "Devolver las cuentas en las que 'login' es propietario" +msgstr "Get the accounts in which the user login \"login\" is the owner" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:18 +msgid "Buscar cuentas a las que 'group_name' tenga acceso" +msgstr "Search for accounts which 'group_name' has access rights" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:19 +msgid "Devolver las cuentas con grupo principal 'group_name'" +msgstr "Get the accounts which have the main group name \"group_name\"" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:20 +msgid "Buscar cuentas con archivos con el nombre 'file_name'" +msgstr "Search for accounts which contains a file with the name 'file_name'" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:21 +msgid "Buscar cuentas por nombre de cliente" +msgstr "Search accounts by client name" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:22 +msgid "Buscar cuentas por nombre de categoría" +msgstr "Search accounts by category name" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:23 +msgid "Devolver la cuenta con ID" +msgstr "Returns the account for the given ID" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:24 +msgid "Buscar cuentas con la clave caducada" +msgstr "Search for accounts with expired password" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:25 +msgid "Devolver las cuentas privadas del usuario actual" +msgstr "Get the private accounts for the current user" + +#: ../../../modules/web/themes/material-blue/views/_partials/help_account_search.inc:26 +msgid "Operador para los parámetros especiales" +msgstr "Operator for special parameters" + #: ../../../modules/web/themes/material-blue/views/_partials/no_records_found.inc:4 #: ../../../modules/web/themes/material-blue/views/account/search-index.inc:11 msgid "No se encontraron registros" msgstr "No records found" #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:77 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:160 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:167 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:162 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:169 #: ../../../modules/web/themes/material-blue/views/install/index.inc:61 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:108 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:115 @@ -5043,7 +5127,7 @@ msgid "Clave (repetir)" msgstr "Password (repeat)" #: ../../../modules/web/themes/material-blue/views/account/account-editpass.inc:101 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:186 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:188 msgid "Seleccionar Fecha" msgstr "Select date" @@ -5059,7 +5143,7 @@ msgstr "Details" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:117 #: ../../../modules/web/themes/material-blue/views/account/account-link.inc:71 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:192 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:194 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:156 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:162 msgid "Notas" @@ -5067,18 +5151,18 @@ msgstr "Notes" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:129 #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:131 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:253 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:255 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:262 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:264 msgid "Historial" msgstr "History" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:136 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:260 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:269 msgid "Seleccionar fecha" msgstr "Select date" #: ../../../modules/web/themes/material-blue/views/account/account-history.inc:147 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:272 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:281 #: ../../../modules/web/themes/material-blue/views/account/details.inc:27 #: ../../../modules/web/themes/material-blue/views/account/details.inc:29 #: ../../../modules/web/themes/material-blue/views/itemshow/user.inc:284 @@ -5088,9 +5172,9 @@ msgstr "Last Modification" #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:22 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:54 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:12 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:28 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:51 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:15 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:32 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:52 msgid "Seleccionar Usuarios" msgstr "Select Users" @@ -5098,25 +5182,19 @@ msgstr "Select Users" #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:36 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:102 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:106 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:8 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:47 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:26 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:67 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:48 msgid "Ver" msgstr "View" #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:92 #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:124 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:51 -#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:67 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:56 +#: ../../../modules/web/themes/material-blue/views/itemshow/item_preset-permission.inc:73 msgid "Seleccionar Grupos" msgstr "Select Groups" -#: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:157 -#: ../../../modules/web/themes/material-blue/views/account/details.inc:37 -#: ../../../modules/web/themes/material-blue/views/account/details.inc:39 -msgid "Creador" -msgstr "Creator" - #: ../../../modules/web/themes/material-blue/views/account/account-permissions.inc:174 #: ../../../modules/web/themes/material-blue/views/account/details.inc:45 #: ../../../modules/web/themes/material-blue/views/account/details.inc:47 @@ -5155,25 +5233,25 @@ msgstr "Send" msgid "Permisos" msgstr "Permissions" -#: ../../../modules/web/themes/material-blue/views/account/account.inc:210 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:212 msgid "Seleccionar Etiquetas" msgstr "Select Tags" -#: ../../../modules/web/themes/material-blue/views/account/account.inc:246 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:255 #: ../../../modules/web/themes/material-blue/views/itemshow/public_link.inc:21 msgid "Seleccionar Cuenta" msgstr "Select Account" -#: ../../../modules/web/themes/material-blue/views/account/account.inc:279 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:281 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:284 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:288 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:290 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:293 #: ../../../modules/web/themes/material-blue/views/account/search-rows.inc:180 msgid "Enlace Público" msgstr "Public Link" -#: ../../../modules/web/themes/material-blue/views/account/account.inc:292 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:294 -#: ../../../modules/web/themes/material-blue/views/account/account.inc:297 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:301 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:303 +#: ../../../modules/web/themes/material-blue/views/account/account.inc:306 msgid "Enlace Directo" msgstr "Direct Link" @@ -5240,74 +5318,26 @@ msgstr "Link to Wiki" msgid "Ver en Wiki" msgstr "View at Wiki" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:25 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:30 -msgid "Parámetros especiales" -msgstr "Special parameters" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:32 -msgid "" -"Es posible utilizar uno o varios parámetros especiales separados por espacios" -msgstr "" -"You could use either one or several special parameters separated by blank " -"spaces" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:34 -msgid "Buscar cuentas a las que 'login' tenga acceso" -msgstr "Search for accounts which 'login' has access rights" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:35 -msgid "Devolver las cuentas en las que 'login' es propietario" -msgstr "Get the accounts in which the user login \"login\" is the owner" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:36 -msgid "Buscar cuentas a las que 'group_name' tenga acceso" -msgstr "Search for accounts which 'group_name' has access rights" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:37 -msgid "Devolver las cuentas con grupo principal 'group_name'" -msgstr "Get the accounts which have the main group name \"group_name\"" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:38 -msgid "Buscar cuentas con archivos con el nombre 'file_name'" -msgstr "Search for accounts which contains a file with the name 'file_name'" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:39 -msgid "Devolver la cuenta con ID" -msgstr "Returns the account for the given ID" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:40 -msgid "Buscar cuentas con la clave caducada" -msgstr "Search for accounts with expired password" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:41 -msgid "Devolver las cuentas privadas del usuario actual" -msgstr "Get the private accounts for the current user" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:42 -msgid "Operador para los parámetros especiales" -msgstr "Operator for special parameters" - -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:50 -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:54 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:47 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:51 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:225 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:226 msgid "Búsqueda global" msgstr "Global searching" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:86 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:64 msgid "Filtrar Favoritos" msgstr "Favorites Filtering" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:100 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:79 msgid "Cuentas por página" msgstr "Accounts per page" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:106 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:85 msgid "Más Filtros" msgstr "More Filters" -#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:111 +#: ../../../modules/web/themes/material-blue/views/account/search-searchbox.inc:90 msgid "Seleccionar Etiqueta" msgstr "Select Tag" @@ -6702,14 +6732,14 @@ msgstr "Master Password Date" msgid "Usado en" msgstr "Used in" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:67 -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:69 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:82 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:84 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:543 #: ../../../modules/web/themes/material-blue/views/itemshow/user_profile.inc:545 msgid "Usado por" msgstr "Used by" -#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:87 +#: ../../../modules/web/themes/material-blue/views/itemshow/user_group.inc:102 msgid "(*) Incluido en grupo" msgstr "(*) Listed in group" @@ -7281,11 +7311,6 @@ msgstr "Search for Custom Field" msgid "Ver Enlace Público" msgstr "Show Public Link" -#. (itstool) path: action/text -#: ../../../config/actions.xml:433 -msgid "Eliminar Enlace Público" -msgstr "Delete Public Link" - #. (itstool) path: action/text #: ../../../config/actions.xml:445 msgid "Buscar Enlace Público" diff --git a/app/modules/api/Controllers/AccountController.php b/app/modules/api/Controllers/AccountController.php index 62022094..63e7e276 100644 --- a/app/modules/api/Controllers/AccountController.php +++ b/app/modules/api/Controllers/AccountController.php @@ -282,7 +282,9 @@ final class AccountController extends ControllerBase $accountSearchFilter->setLimitCount($this->apiService->getParamInt('count', false, 50)); $accountSearchFilter->setSortOrder($this->apiService->getParamInt('order', false, AccountSearchFilter::SORT_DEFAULT)); - $this->returnResponse(ApiResponse::makeSuccess($this->accountService->getByFilter($accountSearchFilter))); + $this->returnResponse( + ApiResponse::makeSuccess( + $this->accountService->getByFilter($accountSearchFilter)->getDataAsArray())); } catch (\Exception $e) { processException($e); diff --git a/app/modules/web/Controllers/AccessManagerController.php b/app/modules/web/Controllers/AccessManagerController.php index c1b0c531..bd85ec58 100644 --- a/app/modules/web/Controllers/AccessManagerController.php +++ b/app/modules/web/Controllers/AccessManagerController.php @@ -94,7 +94,7 @@ final class AccessManagerController extends ControllerBase } if ($this->checkAccess(Acl::AUTHTOKEN)) { - $this->tabsGridHelper->addTab($this->getApiTokensList()); + $this->tabsGridHelper->addTab($this->getAuthTokensList()); } if ($this->configData->isPublinksEnabled() && $this->checkAccess(Acl::PUBLICLINK)) { @@ -165,7 +165,7 @@ final class AccessManagerController extends ControllerBase * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException */ - protected function getApiTokensList() + protected function getAuthTokensList() { return $this->dic->get(AuthTokenGrid::class) ->getGrid($this->dic->get(AuthTokenService::class)->search($this->itemSearchData)) diff --git a/app/modules/web/Controllers/AccountManagerController.php b/app/modules/web/Controllers/AccountManagerController.php index 5a50bb38..99c50605 100644 --- a/app/modules/web/Controllers/AccountManagerController.php +++ b/app/modules/web/Controllers/AccountManagerController.php @@ -31,6 +31,8 @@ use SP\Http\JsonResponse; use SP\Modules\Web\Controllers\Helpers\Grid\AccountGrid; use SP\Modules\Web\Controllers\Traits\ItemTrait; use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Services\Account\AccountSearchFilter; +use SP\Services\Account\AccountSearchService; use SP\Services\Account\AccountService; /** @@ -46,10 +48,18 @@ final class AccountManagerController extends ControllerBase * @var AccountService */ protected $accountService; + /** + * @var AccountSearchService + */ + protected $accountSearchService; /** + * @return bool + * @throws \DI\DependencyException + * @throws \DI\NotFoundException * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException + * @throws \SP\Core\Exceptions\SPException */ public function searchAction() { @@ -68,8 +78,11 @@ final class AccountManagerController extends ControllerBase * getSearchGrid * * @return $this + * @throws \DI\DependencyException + * @throws \DI\NotFoundException * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException + * @throws \SP\Core\Exceptions\SPException */ protected function getSearchGrid() { @@ -77,7 +90,16 @@ final class AccountManagerController extends ControllerBase $accountGrid = $this->dic->get(AccountGrid::class); - return $accountGrid->updatePager($accountGrid->getGrid($this->accountService->search($itemSearchData)), $itemSearchData); + $filter = new AccountSearchFilter(); + $filter->setTxtSearch($itemSearchData->getSeachString()); + $filter->setLimitCount($itemSearchData->getLimitCount()); + $filter->setLimitStart($itemSearchData->getLimitStart()); + $filter->setStringFilters($this->accountSearchService->analyzeQueryFilters($itemSearchData->getSeachString())); + + return $accountGrid->updatePager( + $accountGrid->getGrid( + $this->accountService->getByFilter($filter)), + $itemSearchData); } /** @@ -126,6 +148,8 @@ final class AccountManagerController extends ControllerBase /** * Initialize class * + * @throws \DI\DependencyException + * @throws \DI\NotFoundException * @throws \SP\Services\Auth\AuthException */ protected function initialize() @@ -133,5 +157,6 @@ final class AccountManagerController extends ControllerBase $this->checkLoggedIn(); $this->accountService = $this->dic->get(AccountService::class); + $this->accountSearchService = $this->dic->get(AccountSearchService::class); } } \ No newline at end of file diff --git a/app/modules/web/Controllers/AuthTokenController.php b/app/modules/web/Controllers/AuthTokenController.php index d7913728..722c3248 100644 --- a/app/modules/web/Controllers/AuthTokenController.php +++ b/app/modules/web/Controllers/AuthTokenController.php @@ -56,6 +56,9 @@ final class AuthTokenController extends ControllerBase implements CrudController /** * Search action * + * @return bool + * @throws \DI\DependencyException + * @throws \DI\NotFoundException * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException */ @@ -76,6 +79,8 @@ final class AuthTokenController extends ControllerBase implements CrudController * getSearchGrid * * @return $this + * @throws \DI\DependencyException + * @throws \DI\NotFoundException * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException */ @@ -85,7 +90,10 @@ final class AuthTokenController extends ControllerBase implements CrudController $authTokenGrid = $this->dic->get(AuthTokenGrid::class); - return $authTokenGrid->updatePager($authTokenGrid->getGrid($this->authTokenService->search($itemSearchData)), $itemSearchData); + return $authTokenGrid->updatePager( + $authTokenGrid->getGrid($this->authTokenService->search($itemSearchData)), + $itemSearchData + ); } /** diff --git a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php index 82452612..7b25a074 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php @@ -27,8 +27,8 @@ namespace SP\Modules\Web\Controllers\Helpers\Account; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Core\UI\ThemeIcons; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Modules\Web\Controllers\Helpers\HelperBase; use SP\Services\Account\AccountAcl; use SP\Services\Account\AccountSearchItem; @@ -50,7 +50,7 @@ final class AccountActionsHelper extends HelperBase protected $sk; /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ public function getViewAction() { @@ -166,7 +166,7 @@ final class AccountActionsHelper extends HelperBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ public function getEditAction() { @@ -187,7 +187,7 @@ final class AccountActionsHelper extends HelperBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ public function getRequestAction() { @@ -252,7 +252,7 @@ final class AccountActionsHelper extends HelperBase * @param AccountAcl $accountAcl * @param AccountActionsDto $accountActionsDto * - * @return DataGridAction[] + * @return \SP\Html\DataGrid\Action\DataGridAction[] */ public function getActionsGrouppedForAccount(AccountAcl $accountAcl, AccountActionsDto $accountActionsDto) { @@ -388,7 +388,7 @@ final class AccountActionsHelper extends HelperBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ public function getPublicLinkAction() { diff --git a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php index f2467c80..8b1513ff 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php @@ -26,13 +26,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Account; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; use SP\Html\DataGrid\DataGrid; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeaderSort; -use SP\Html\DataGrid\DataGridPager; use SP\Html\DataGrid\DataGridSort; +use SP\Html\DataGrid\Layout\DataGridHeaderSort; +use SP\Html\DataGrid\Layout\DataGridPager; use SP\Modules\Web\Controllers\Helpers\HelperBase; use SP\Mvc\View\Components\SelectItemAdapter; use SP\Services\Account\AccountSearchFilter; @@ -66,7 +66,7 @@ final class AccountSearchHelper extends HelperBase */ private $isAjax = false; /** - * @var \SP\Services\Account\AccountSearchFilter + * @var AccountSearchFilter */ private $accountSearchFilter; @@ -81,6 +81,8 @@ final class AccountSearchHelper extends HelperBase /** * Obtener los datos para la caja de búsqueda * + * @throws \DI\DependencyException + * @throws \DI\NotFoundException * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException */ @@ -88,14 +90,25 @@ final class AccountSearchHelper extends HelperBase { $this->view->addTemplate('search-searchbox'); - $this->view->assign('clients', SelectItemAdapter::factory($this->dic->get(ClientService::class)->getAllForUser())->getItemsFromModelSelected([$this->accountSearchFilter->getClientId()])); - $this->view->assign('categories', SelectItemAdapter::factory(CategoryService::getItemsBasic())->getItemsFromModelSelected([$this->accountSearchFilter->getCategoryId()])); - $this->view->assign('tags', SelectItemAdapter::factory(TagService::getItemsBasic())->getItemsFromModelSelected($this->accountSearchFilter->getTagsId())); + $this->view->assign('clients', + SelectItemAdapter::factory( + $this->dic->get(ClientService::class) + ->getAllForUser())->getItemsFromModelSelected([$this->accountSearchFilter->getClientId()])); + $this->view->assign('categories', + SelectItemAdapter::factory( + CategoryService::getItemsBasic()) + ->getItemsFromModelSelected([$this->accountSearchFilter->getCategoryId()])); + $this->view->assign('tags', + SelectItemAdapter::factory( + TagService::getItemsBasic()) + ->getItemsFromModelSelected($this->accountSearchFilter->getTagsId())); } /** * Obtener los resultados de una búsqueda * + * @throws \DI\DependencyException + * @throws \DI\NotFoundException * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException * @throws \SP\Core\Exceptions\SPException @@ -118,13 +131,13 @@ final class AccountSearchHelper extends HelperBase AccountSearchItem::$accountLink = $userPreferences->isAccountLink(); AccountSearchItem::$topNavbar = $userPreferences->isTopNavbar(); - \SP\Services\Account\AccountSearchItem::$optionalActions = $userPreferences->isOptionalActions(); + AccountSearchItem::$optionalActions = $userPreferences->isOptionalActions(); AccountSearchItem::$wikiEnabled = $this->configData->isWikiEnabled(); AccountSearchItem::$dokuWikiEnabled = $this->configData->isDokuwikiEnabled(); - \SP\Services\Account\AccountSearchItem::$publicLinkEnabled = $this->configData->isPublinksEnabled(); + AccountSearchItem::$publicLinkEnabled = $this->configData->isPublinksEnabled(); AccountSearchItem::$isDemoMode = $this->configData->isDemoEnabled(); - if (\SP\Services\Account\AccountSearchItem::$wikiEnabled) { + if (AccountSearchItem::$wikiEnabled) { $wikiFilter = array_map(function ($value) { return preg_quote($value, '/'); }, $this->configData->getWikiFilter()); @@ -151,108 +164,113 @@ final class AccountSearchHelper extends HelperBase * Devuelve la matriz a utilizar en la vista * * @return DataGrid + * @throws \DI\DependencyException + * @throws \DI\NotFoundException */ private function getGrid() { $icons = $this->view->getTheme()->getIcons(); - $GridActionOptional = new DataGridAction(); - $GridActionOptional->setId(0); - $GridActionOptional->setName(__('Más Acciones')); - $GridActionOptional->setTitle(__('Más Acciones')); - $GridActionOptional->setIcon($icons->getIconOptional()); - $GridActionOptional->setRuntimeFilter(AccountSearchItem::class, 'isShowOptional'); - $GridActionOptional->addData('onclick', 'account/menu'); + $gridActionOptional = new DataGridAction(); + $gridActionOptional->setId(0); + $gridActionOptional->setName(__('Más Acciones')); + $gridActionOptional->setTitle(__('Más Acciones')); + $gridActionOptional->setIcon($icons->getIconOptional()); + $gridActionOptional->setRuntimeFilter(AccountSearchItem::class, 'isShowOptional'); + $gridActionOptional->addData('onclick', 'account/menu'); - $GridPager = new DataGridPager(); - $GridPager->setIconPrev($icons->getIconNavPrev()); - $GridPager->setIconNext($icons->getIconNavNext()); - $GridPager->setIconFirst($icons->getIconNavFirst()); - $GridPager->setIconLast($icons->getIconNavLast()); - $GridPager->setSortKey($this->accountSearchFilter->getSortKey()); - $GridPager->setSortOrder($this->accountSearchFilter->getSortOrder()); - $GridPager->setLimitStart($this->accountSearchFilter->getLimitStart()); - $GridPager->setLimitCount($this->accountSearchFilter->getLimitCount()); - $GridPager->setOnClickFunction('account/sort'); - $GridPager->setFilterOn($this->filterOn); - $GridPager->setSourceAction(new DataGridActionSearch(ActionsInterface::ACCOUNT_SEARCH)); + $gridPager = new DataGridPager(); + $gridPager->setIconPrev($icons->getIconNavPrev()); + $gridPager->setIconNext($icons->getIconNavNext()); + $gridPager->setIconFirst($icons->getIconNavFirst()); + $gridPager->setIconLast($icons->getIconNavLast()); + $gridPager->setSortKey($this->accountSearchFilter->getSortKey()); + $gridPager->setSortOrder($this->accountSearchFilter->getSortOrder()); + $gridPager->setLimitStart($this->accountSearchFilter->getLimitStart()); + $gridPager->setLimitCount($this->accountSearchFilter->getLimitCount()); + $gridPager->setOnClickFunction('account/sort'); + $gridPager->setFilterOn($this->filterOn); + $gridPager->setSourceAction(new DataGridActionSearch(ActionsInterface::ACCOUNT_SEARCH)); $userPreferences = $this->context->getUserData()->getPreferences(); - $showOptionalActions = $userPreferences->isOptionalActions() || $userPreferences->isResultsAsCards() || ($userPreferences->getUserId() === 0 && $this->configData->isResultsAsCards()); + $showOptionalActions = $userPreferences->isOptionalActions() + || $userPreferences->isResultsAsCards() + || ($userPreferences->getUserId() === 0 + && $this->configData->isResultsAsCards()); $actions = $this->dic->get(AccountActionsHelper::class); - $Grid = new DataGrid($this->view->getTheme()); - $Grid->setId('gridSearch'); - $Grid->setDataHeaderTemplate('search-header', $this->view->getBase()); - $Grid->setDataRowTemplate('search-rows', $this->view->getBase()); - $Grid->setDataPagerTemplate('datagrid-nav-full', 'grid'); - $Grid->setHeader($this->getHeaderSort()); - $Grid->setDataActions($actions->getViewAction()); - $Grid->setDataActions($actions->getViewPassAction()); - $Grid->setDataActions($actions->getCopyPassAction()); - $Grid->setDataActions($actions->getEditAction(), !$showOptionalActions); - $Grid->setDataActions($actions->getCopyAction(), !$showOptionalActions); - $Grid->setDataActions($actions->getDeleteAction(), !$showOptionalActions); - $Grid->setDataActions($actions->getRequestAction()); - $Grid->setPager($GridPager); - $Grid->setData(new DataGridData()); + $grid = new DataGrid($this->view->getTheme()); + $grid->setId('gridSearch'); + $grid->setDataHeaderTemplate('search-header', $this->view->getBase()); + $grid->setDataRowTemplate('search-rows', $this->view->getBase()); + $grid->setDataPagerTemplate('datagrid-nav-full', 'grid'); + $grid->setHeader($this->getHeaderSort()); + $grid->addDataAction($actions->getViewAction()); + $grid->addDataAction($actions->getViewPassAction()); + $grid->addDataAction($actions->getCopyPassAction()); + $grid->addDataAction($actions->getEditAction(), !$showOptionalActions); + $grid->addDataAction($actions->getCopyAction(), !$showOptionalActions); + $grid->addDataAction($actions->getDeleteAction(), !$showOptionalActions); + $grid->addDataAction($actions->getRequestAction()); + $grid->setPager($gridPager); + $grid->setData(new DataGridData()); - return $Grid; + return $grid; } /** * Devolver la cabecera con los campos de ordenación * - * @return DataGridHeaderSort + * @return \SP\Html\DataGrid\Layout\DataGridHeaderSort */ private function getHeaderSort() { $icons = $this->view->getTheme()->getIcons(); - $GridSortCustomer = new DataGridSort(); - $GridSortCustomer->setName(__('Cliente')) + $gridSortCustomer = new DataGridSort(); + $gridSortCustomer->setName(__('Cliente')) ->setTitle(__('Ordenar por Cliente')) - ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_CLIENT) + ->setSortKey(AccountSearchFilter::SORT_CLIENT) ->setIconUp($icons->getIconUp()) ->setIconDown($icons->getIconDown()); - $GridSortName = new DataGridSort(); - $GridSortName->setName(__('Nombre')) + $gridSortName = new DataGridSort(); + $gridSortName->setName(__('Nombre')) ->setTitle(__('Ordenar por Nombre')) - ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_NAME) + ->setSortKey(AccountSearchFilter::SORT_NAME) ->setIconUp($icons->getIconUp()) ->setIconDown($icons->getIconDown()); - $GridSortCategory = new DataGridSort(); - $GridSortCategory->setName(__('Categoría')) + $gridSortCategory = new DataGridSort(); + $gridSortCategory->setName(__('Categoría')) ->setTitle(__('Ordenar por Categoría')) - ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_CATEGORY) + ->setSortKey(AccountSearchFilter::SORT_CATEGORY) ->setIconUp($icons->getIconUp()) ->setIconDown($icons->getIconDown()); - $GridSortLogin = new DataGridSort(); - $GridSortLogin->setName(__('Usuario')) + $gridSortLogin = new DataGridSort(); + $gridSortLogin->setName(__('Usuario')) ->setTitle(__('Ordenar por Usuario')) - ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_LOGIN) + ->setSortKey(AccountSearchFilter::SORT_LOGIN) ->setIconUp($icons->getIconUp()) ->setIconDown($icons->getIconDown()); - $GridSortUrl = new DataGridSort(); - $GridSortUrl->setName(__('URL / IP')) + $gridSortUrl = new DataGridSort(); + $gridSortUrl->setName(__('URL / IP')) ->setTitle(__('Ordenar por URL / IP')) - ->setSortKey(\SP\Services\Account\AccountSearchFilter::SORT_URL) + ->setSortKey(AccountSearchFilter::SORT_URL) ->setIconUp($icons->getIconUp()) ->setIconDown($icons->getIconDown()); - $GridHeaderSort = new DataGridHeaderSort(); - $GridHeaderSort->addSortField($GridSortCustomer) - ->addSortField($GridSortName) - ->addSortField($GridSortCategory) - ->addSortField($GridSortLogin) - ->addSortField($GridSortUrl); + $gridHeaderSort = new DataGridHeaderSort(); + $gridHeaderSort->addSortField($gridSortCustomer) + ->addSortField($gridSortName) + ->addSortField($gridSortCategory) + ->addSortField($gridSortLogin) + ->addSortField($gridSortUrl); - return $GridHeaderSort; + return $gridHeaderSort; } /** @@ -275,8 +293,12 @@ final class AccountSearchHelper extends HelperBase { $userData = $this->context->getUserData(); - $this->view->assign('isAdmin', $userData->getIsAdminApp() || $userData->getIsAdminAcc()); - $this->view->assign('showGlobalSearch', $this->configData->isGlobalSearch() && $this->context->getUserProfile()->isAccGlobalSearch()); + $this->view->assign('isAdmin', + $userData->getIsAdminApp() + || $userData->getIsAdminAcc()); + $this->view->assign('showGlobalSearch', + $this->configData->isGlobalSearch() + && $this->context->getUserProfile()->isAccGlobalSearch()); // Obtener el filtro de búsqueda desde la sesión $this->accountSearchFilter = $this->getFilters(); @@ -297,7 +319,7 @@ final class AccountSearchHelper extends HelperBase /** * Set search filters * - * @return \SP\Services\Account\AccountSearchFilter + * @return AccountSearchFilter */ private function getFilters() { @@ -309,7 +331,7 @@ final class AccountSearchHelper extends HelperBase } $userPreferences = $this->context->getUserData()->getPreferences(); - $limitCount = ($userPreferences->getResultsPerPage() > 0) ? $userPreferences->getResultsPerPage() : $this->configData->getAccountCount(); + $limitCount = $userPreferences->getResultsPerPage() > 0 ? $userPreferences->getResultsPerPage() : $this->configData->getAccountCount(); $accountSearchFilter = new AccountSearchFilter(); $accountSearchFilter->setSortKey($this->request->analyzeInt('skey', 0)); diff --git a/app/modules/web/Controllers/Helpers/Grid/AccountGrid.php b/app/modules/web/Controllers/Helpers/Grid/AccountGrid.php index 7cbf96ed..11112cab 100644 --- a/app/modules/web/Controllers/Helpers/Grid/AccountGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/AccountGrid.php @@ -26,13 +26,14 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionHelp; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -60,11 +61,13 @@ final class AccountGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction(new DataGridActionHelp('help_account_search')); + + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -93,7 +96,7 @@ final class AccountGrid extends GridBase } /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected function getHeader(): DataGridHeader { @@ -102,6 +105,8 @@ final class AccountGrid extends GridBase $gridHeader->addHeader(__('Nombre')); $gridHeader->addHeader(__('Cliente')); $gridHeader->addHeader(__('Categoría')); + $gridHeader->addHeader(__('Creador')); + $gridHeader->addHeader(__('Grupo')); return $gridHeader; } @@ -117,6 +122,8 @@ final class AccountGrid extends GridBase $gridData->addDataRowSource('name'); $gridData->addDataRowSource('clientName'); $gridData->addDataRowSource('categoryName'); + $gridData->addDataRowSource('userName'); + $gridData->addDataRowSource('userGroupName'); $gridData->setData($this->queryResult); return $gridData; diff --git a/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php b/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php index 783833c2..5f26f880 100644 --- a/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/AccountHistoryGrid.php @@ -26,13 +26,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -60,12 +60,12 @@ final class AccountHistoryGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getRestoreAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getRestoreAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -94,7 +94,7 @@ final class AccountHistoryGrid extends GridBase } /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected function getHeader(): DataGridHeader { @@ -149,7 +149,7 @@ final class AccountHistoryGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getRestoreAction() { @@ -166,7 +166,7 @@ final class AccountHistoryGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getDeleteAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php b/app/modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php index ecd9cb69..1c503d00 100644 --- a/app/modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/AuthTokenGrid.php @@ -27,13 +27,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -61,14 +61,14 @@ final class AuthTokenGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getCreateAction()); - $grid->setDataActions($this->getViewAction()); - $grid->setDataActions($this->getEditAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getCreateAction()); + $grid->addDataAction($this->getViewAction()); + $grid->addDataAction($this->getEditAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -97,7 +97,7 @@ final class AuthTokenGrid extends GridBase } /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected function getHeader(): DataGridHeader { @@ -127,7 +127,7 @@ final class AuthTokenGrid extends GridBase } /** - * @return DataGridActionSearch + * @return \SP\Html\DataGrid\Action\DataGridActionSearch */ private function getSearchAction() { @@ -162,7 +162,7 @@ final class AuthTokenGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getViewAction() { @@ -179,7 +179,7 @@ final class AuthTokenGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getEditAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/CategoryGrid.php b/app/modules/web/Controllers/Helpers/Grid/CategoryGrid.php index 4adcc031..65faf865 100644 --- a/app/modules/web/Controllers/Helpers/Grid/CategoryGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/CategoryGrid.php @@ -27,13 +27,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -61,13 +61,13 @@ final class CategoryGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getCreateAction()); - $grid->setDataActions($this->getEditAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getCreateAction()); + $grid->addDataAction($this->getEditAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -96,7 +96,7 @@ final class CategoryGrid extends GridBase } /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected function getHeader(): DataGridHeader { @@ -124,7 +124,7 @@ final class CategoryGrid extends GridBase } /** - * @return DataGridActionSearch + * @return \SP\Html\DataGrid\Action\DataGridActionSearch */ private function getSearchAction() { @@ -159,7 +159,7 @@ final class CategoryGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getEditAction() { @@ -176,7 +176,7 @@ final class CategoryGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getDeleteAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/ClientGrid.php b/app/modules/web/Controllers/Helpers/Grid/ClientGrid.php index f7446e95..a3c72ae9 100644 --- a/app/modules/web/Controllers/Helpers/Grid/ClientGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/ClientGrid.php @@ -26,13 +26,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -60,13 +60,13 @@ final class ClientGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getCreateAction()); - $grid->setDataActions($this->getEditAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getCreateAction()); + $grid->addDataAction($this->getEditAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -127,7 +127,7 @@ final class ClientGrid extends GridBase } /** - * @return DataGridActionSearch + * @return \SP\Html\DataGrid\Action\DataGridActionSearch */ private function getSearchAction() { @@ -144,7 +144,7 @@ final class ClientGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getCreateAction() { @@ -162,7 +162,7 @@ final class ClientGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getEditAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php b/app/modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php index 79d6dc38..d000dbd6 100644 --- a/app/modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/CustomFieldGrid.php @@ -26,13 +26,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Services\CustomField\CustomFieldDefService; use SP\Storage\Database\QueryResult; @@ -61,13 +61,13 @@ final class CustomFieldGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getCreateAction()); - $grid->setDataActions($this->getEditAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getCreateAction()); + $grid->addDataAction($this->getEditAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -97,7 +97,7 @@ final class CustomFieldGrid extends GridBase } /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected function getHeader(): DataGridHeader { @@ -131,7 +131,7 @@ final class CustomFieldGrid extends GridBase } /** - * @return DataGridActionSearch + * @return \SP\Html\DataGrid\Action\DataGridActionSearch */ private function getSearchAction() { @@ -148,7 +148,7 @@ final class CustomFieldGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getCreateAction() { @@ -166,7 +166,7 @@ final class CustomFieldGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getEditAction() { @@ -183,7 +183,7 @@ final class CustomFieldGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getDeleteAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/EventlogGrid.php b/app/modules/web/Controllers/Helpers/Grid/EventlogGrid.php index d126ce70..a9c4cbe5 100644 --- a/app/modules/web/Controllers/Helpers/Grid/EventlogGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/EventlogGrid.php @@ -27,13 +27,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -61,11 +61,11 @@ final class EventlogGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getRefrestAction()); - $grid->setDataActions($this->getClearAction()); + $grid->addDataAction($this->getRefrestAction()); + $grid->addDataAction($this->getClearAction()); $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5)); @@ -154,7 +154,7 @@ final class EventlogGrid extends GridBase } /** - * @return DataGridActionSearch + * @return \SP\Html\DataGrid\Action\DataGridActionSearch */ private function getSearchAction() { @@ -171,7 +171,7 @@ final class EventlogGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getRefrestAction() { @@ -189,7 +189,7 @@ final class EventlogGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getClearAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/FileGrid.php b/app/modules/web/Controllers/Helpers/Grid/FileGrid.php index d0dea813..907fe441 100644 --- a/app/modules/web/Controllers/Helpers/Grid/FileGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/FileGrid.php @@ -26,13 +26,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -60,13 +60,13 @@ final class FileGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getViewAction()); - $grid->setDataActions($this->getDownloadAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getViewAction()); + $grid->addDataAction($this->getDownloadAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -96,7 +96,7 @@ final class FileGrid extends GridBase } /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected function getHeader(): DataGridHeader { diff --git a/app/modules/web/Controllers/Helpers/Grid/GridBase.php b/app/modules/web/Controllers/Helpers/Grid/GridBase.php index 481703f8..588dc72e 100644 --- a/app/modules/web/Controllers/Helpers/Grid/GridBase.php +++ b/app/modules/web/Controllers/Helpers/Grid/GridBase.php @@ -27,11 +27,11 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\UI\ThemeIcons; use SP\DataModel\ItemSearchData; -use SP\Html\DataGrid\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionSearch; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; -use SP\Html\DataGrid\DataGridPager; +use SP\Html\DataGrid\Layout\DataGridHeader; +use SP\Html\DataGrid\Layout\DataGridPager; use SP\Modules\Web\Controllers\Helpers\HelperBase; /** @@ -77,9 +77,9 @@ abstract class GridBase extends HelperBase implements GridInterface /** * Devolver el paginador por defecto * - * @param DataGridActionSearch $sourceAction + * @param \SP\Html\DataGrid\Action\DataGridActionSearch $sourceAction * - * @return DataGridPager + * @return \SP\Html\DataGrid\Layout\DataGridPager */ final protected function getPager(DataGridActionSearch $sourceAction) { @@ -113,7 +113,7 @@ abstract class GridBase extends HelperBase implements GridInterface protected abstract function getGridLayout(): DataGridInterface; /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected abstract function getHeader(): DataGridHeader; diff --git a/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php b/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php index a4bf2210..1ca33017 100644 --- a/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/ItemPresetGrid.php @@ -26,13 +26,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Services\ItemPreset\ItemPresetInterface; use SP\Storage\Database\QueryResult; @@ -61,16 +61,16 @@ final class ItemPresetGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getCreatePermissionAction(), true); - $grid->setDataActions($this->getCreatePrivateAction(), true); - $grid->setDataActions($this->getCreateSessionTimeoutAction(), true); - $grid->setDataActions($this->getCreateAccountPasswordAction(), true); - $grid->setDataActions($this->getEditAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions($this->getDeleteAction() + $grid->addDataAction($this->getCreatePermissionAction(), true); + $grid->addDataAction($this->getCreatePrivateAction(), true); + $grid->addDataAction($this->getCreateSessionTimeoutAction(), true); + $grid->addDataAction($this->getCreateAccountPasswordAction(), true); + $grid->addDataAction($this->getEditAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction($this->getDeleteAction() ->setTitle(__('Eliminar Seleccionados')) ->setName(__('Eliminar Seleccionados')), true); @@ -97,7 +97,7 @@ final class ItemPresetGrid extends GridBase } /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected function getHeader(): DataGridHeader { diff --git a/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php b/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php index 8c8db322..0fd424f5 100644 --- a/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/NotificationGrid.php @@ -27,14 +27,14 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionInterface; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGrid; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionInterface; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; use SP\Util\DateUtil; @@ -67,20 +67,20 @@ final class NotificationGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); $this->isAdminApp = (bool)$this->context->getUserData()->getIsAdminApp(); if ($this->isAdminApp) { - $grid->setDataActions($this->getCreateAction()); + $grid->addDataAction($this->getCreateAction()); } - $grid->setDataActions($this->getViewAction()); - $grid->setDataActions($this->setNonAdminFilter($this->getCheckAction())); - $grid->setDataActions($this->setNonAdminFilter($this->getEditAction())); - $grid->setDataActions($this->setNonAdminFilter($this->getDeleteAction())); - $grid->setDataActions( + $grid->addDataAction($this->getViewAction()); + $grid->addDataAction($this->setNonAdminFilter($this->getCheckAction())); + $grid->addDataAction($this->setNonAdminFilter($this->getEditAction())); + $grid->addDataAction($this->setNonAdminFilter($this->getDeleteAction())); + $grid->addDataAction( $this->setNonAdminFilter( $this->getDeleteAction() ->setTitle(__('Eliminar Seleccionados')) @@ -112,7 +112,7 @@ final class NotificationGrid extends GridBase } /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected function getHeader(): DataGridHeader { @@ -151,7 +151,7 @@ final class NotificationGrid extends GridBase } /** - * @return DataGridActionSearch + * @return \SP\Html\DataGrid\Action\DataGridActionSearch */ private function getSearchAction() { @@ -168,7 +168,7 @@ final class NotificationGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getCreateAction() { @@ -186,7 +186,7 @@ final class NotificationGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getViewAction() { @@ -217,7 +217,7 @@ final class NotificationGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getCheckAction() { @@ -235,7 +235,7 @@ final class NotificationGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getEditAction() { @@ -251,7 +251,7 @@ final class NotificationGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getDeleteAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/PluginGrid.php b/app/modules/web/Controllers/Helpers/Grid/PluginGrid.php index 72d07b3b..e3aa8c62 100644 --- a/app/modules/web/Controllers/Helpers/Grid/PluginGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/PluginGrid.php @@ -27,13 +27,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -61,13 +61,13 @@ final class PluginGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getViewAction()); - $grid->setDataActions($this->getEnableAction()); - $grid->setDataActions($this->getDisableAction()); - $grid->setDataActions($this->getResetAction()); + $grid->addDataAction($this->getViewAction()); + $grid->addDataAction($this->getEnableAction()); + $grid->addDataAction($this->getDisableAction()); + $grid->addDataAction($this->getResetAction()); $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5)); @@ -122,7 +122,7 @@ final class PluginGrid extends GridBase } /** - * @return DataGridActionSearch + * @return \SP\Html\DataGrid\Action\DataGridActionSearch */ private function getSearchAction() { @@ -176,7 +176,7 @@ final class PluginGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getDisableAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php b/app/modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php index d6e3fb31..baf11484 100644 --- a/app/modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/PublicLinkGrid.php @@ -27,13 +27,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -61,14 +61,14 @@ final class PublicLinkGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getCreateAction()); - $grid->setDataActions($this->getViewAction()); - $grid->setDataActions($this->getRefreshAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getCreateAction()); + $grid->addDataAction($this->getViewAction()); + $grid->addDataAction($this->getRefreshAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -98,7 +98,7 @@ final class PublicLinkGrid extends GridBase } /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected function getHeader(): DataGridHeader { @@ -136,7 +136,7 @@ final class PublicLinkGrid extends GridBase } /** - * @return DataGridActionSearch + * @return \SP\Html\DataGrid\Action\DataGridActionSearch */ private function getSearchAction() { @@ -171,7 +171,7 @@ final class PublicLinkGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getViewAction() { @@ -204,7 +204,7 @@ final class PublicLinkGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getDeleteAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/TagGrid.php b/app/modules/web/Controllers/Helpers/Grid/TagGrid.php index 20bf6fe6..3ef2e8e9 100644 --- a/app/modules/web/Controllers/Helpers/Grid/TagGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/TagGrid.php @@ -27,13 +27,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -61,13 +61,13 @@ final class TagGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getCreateAction()); - $grid->setDataActions($this->getEditAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getCreateAction()); + $grid->addDataAction($this->getEditAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -139,7 +139,7 @@ final class TagGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getCreateAction() { @@ -174,7 +174,7 @@ final class TagGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getDeleteAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/TrackGrid.php b/app/modules/web/Controllers/Helpers/Grid/TrackGrid.php index 15e4da6d..ace1f822 100644 --- a/app/modules/web/Controllers/Helpers/Grid/TrackGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/TrackGrid.php @@ -26,13 +26,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Http\Address; use SP\Storage\Database\QueryResult; @@ -61,12 +61,12 @@ final class TrackGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getRefrestAction()); - $grid->setDataActions($this->getClearAction()); - $grid->setDataActions($this->getUnlockAction()); + $grid->addDataAction($this->getRefrestAction()); + $grid->addDataAction($this->getClearAction()); + $grid->addDataAction($this->getUnlockAction()); $grid->setTime(round(getElapsedTime($this->queryTimeStart), 5)); @@ -150,7 +150,7 @@ final class TrackGrid extends GridBase } /** - * @return DataGridActionSearch + * @return \SP\Html\DataGrid\Action\DataGridActionSearch */ private function getSearchAction() { @@ -167,7 +167,7 @@ final class TrackGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getRefrestAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/UserGrid.php b/app/modules/web/Controllers/Helpers/Grid/UserGrid.php index 33f15d18..aa0e03e6 100644 --- a/app/modules/web/Controllers/Helpers/Grid/UserGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/UserGrid.php @@ -28,13 +28,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; use SP\Html\Assets\FontIcon; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -62,22 +62,22 @@ final class UserGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getCreateAction()); + $grid->addDataAction($this->getCreateAction()); if ($this->acl->checkUserAccess(ActionsInterface::CONFIG_IMPORT) && $this->configData->isLdapEnabled() ) { - $grid->setDataActions($this->getLdapSyncAction()); + $grid->addDataAction($this->getLdapSyncAction()); } - $grid->setDataActions($this->getViewAction()); - $grid->setDataActions($this->getEditAction()); - $grid->setDataActions($this->getEditPassAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getViewAction()); + $grid->addDataAction($this->getEditAction()); + $grid->addDataAction($this->getEditPassAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -160,7 +160,7 @@ final class UserGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getCreateAction() { @@ -195,7 +195,7 @@ final class UserGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getDeleteAction() { @@ -230,7 +230,7 @@ final class UserGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getViewAction() { @@ -247,7 +247,7 @@ final class UserGrid extends GridBase } /** - * @return DataGridAction + * @return \SP\Html\DataGrid\Action\DataGridAction */ private function getEditPassAction() { diff --git a/app/modules/web/Controllers/Helpers/Grid/UserGroupGrid.php b/app/modules/web/Controllers/Helpers/Grid/UserGroupGrid.php index 97e2a44f..615f346f 100644 --- a/app/modules/web/Controllers/Helpers/Grid/UserGroupGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/UserGroupGrid.php @@ -27,13 +27,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -61,14 +61,14 @@ final class UserGroupGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getCreateAction()); - $grid->setDataActions($this->getViewAction()); - $grid->setDataActions($this->getEditAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getCreateAction()); + $grid->addDataAction($this->getViewAction()); + $grid->addDataAction($this->getEditAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), @@ -97,7 +97,7 @@ final class UserGroupGrid extends GridBase } /** - * @return DataGridHeader + * @return \SP\Html\DataGrid\Layout\DataGridHeader */ protected function getHeader(): DataGridHeader { diff --git a/app/modules/web/Controllers/Helpers/Grid/UserProfileGrid.php b/app/modules/web/Controllers/Helpers/Grid/UserProfileGrid.php index 3d9da31f..71be7d31 100644 --- a/app/modules/web/Controllers/Helpers/Grid/UserProfileGrid.php +++ b/app/modules/web/Controllers/Helpers/Grid/UserProfileGrid.php @@ -27,13 +27,13 @@ namespace SP\Modules\Web\Controllers\Helpers\Grid; use SP\Core\Acl\Acl; use SP\Core\Acl\ActionsInterface; -use SP\Html\DataGrid\DataGridAction; -use SP\Html\DataGrid\DataGridActionSearch; -use SP\Html\DataGrid\DataGridActionType; +use SP\Html\DataGrid\Action\DataGridAction; +use SP\Html\DataGrid\Action\DataGridActionSearch; +use SP\Html\DataGrid\Action\DataGridActionType; use SP\Html\DataGrid\DataGridData; -use SP\Html\DataGrid\DataGridHeader; use SP\Html\DataGrid\DataGridInterface; use SP\Html\DataGrid\DataGridTab; +use SP\Html\DataGrid\Layout\DataGridHeader; use SP\Storage\Database\QueryResult; /** @@ -61,14 +61,14 @@ final class UserProfileGrid extends GridBase $searchAction = $this->getSearchAction(); - $grid->setDataActions($searchAction); + $grid->addDataAction($searchAction); $grid->setPager($this->getPager($searchAction)); - $grid->setDataActions($this->getCreateAction()); - $grid->setDataActions($this->getViewAction()); - $grid->setDataActions($this->getEditAction()); - $grid->setDataActions($this->getDeleteAction()); - $grid->setDataActions( + $grid->addDataAction($this->getCreateAction()); + $grid->addDataAction($this->getViewAction()); + $grid->addDataAction($this->getEditAction()); + $grid->addDataAction($this->getDeleteAction()); + $grid->addDataAction( $this->getDeleteAction() ->setName(__('Eliminar Seleccionados')) ->setTitle(__('Eliminar Seleccionados')), diff --git a/app/modules/web/Controllers/Helpers/LayoutHelper.php b/app/modules/web/Controllers/Helpers/LayoutHelper.php index 86b5bd02..63d8c395 100644 --- a/app/modules/web/Controllers/Helpers/LayoutHelper.php +++ b/app/modules/web/Controllers/Helpers/LayoutHelper.php @@ -33,7 +33,7 @@ use SP\Core\Exceptions\SPException; use SP\Core\Language; use SP\Core\UI\Theme; use SP\Core\UI\ThemeInterface; -use SP\Html\DataGrid\DataGridAction; +use SP\Html\DataGrid\Action\DataGridAction; use SP\Http\Uri; use SP\Plugin\PluginManager; use SP\Services\Install\Installer; diff --git a/app/modules/web/themes/material-blue/views/_partials/fixed-header.inc b/app/modules/web/themes/material-blue/views/_partials/fixed-header.inc index bec8a659..825815f9 100644 --- a/app/modules/web/themes/material-blue/views/_partials/fixed-header.inc +++ b/app/modules/web/themes/material-blue/views/_partials/fixed-header.inc @@ -15,7 +15,7 @@