more testing fixes

Signed-off-by: Banana <mail@bananas-playground.net>

diff --git a/upgrade/from-version-1.6.txt b/upgrade/from-version-1.6.txt
index 5dc7b31e0cffed6c0f2213352a1663866a46421f..50b70d0e6371a50736020418d598844672c0524b 100644 (file)
--- a/upgrade/from-version-1.6.txt
+++ b/upgrade/from-version-1.6.txt
@@ -54,4 +54,5 @@ UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.artist' WHERE `#RE
 UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.artists' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'artists';
 UPDATE `#REPLACEME#_sys_fields` SET `displayname` = 'sysfield.isbn' WHERE `#REPLACEME#_sys_fields`.`identifier` = 'isbn';
 ALTER TABLE `#REPLACEME#_sys_fields` CHANGE `displayname` `displayname` VARCHAR(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL;
+UPDATE `#REPLACEME#_tool` SET `name` = 'IMDB' WHERE `#REPLACEME#_tool`.`id` = 1;
 ```

diff --git a/webclient/i18n/deu.ini b/webclient/i18n/deu.ini
index 3d5e753cc7b6874af5896831bd32dfbd07642dfb..32161e1cb8ed189f3403cd8c2e96eaea0194f4df 100644 (file)
--- a/webclient/i18n/deu.ini
+++ b/webclient/i18n/deu.ini
@@ -43,7 +43,6 @@ global.login = "Login"
 global.message.couldNotBeSaved = "Daten konnten nicht gespeichert werden. Mehr dazu in den Logdateien."
 global.message.couldNotLoadCollection = "Angegebene Sammlung konnte nicht geladen werden."
 global.message.dataSaved = "Daten erfolgreich gespeichert"
-global.message.here = "Hier"
 global.message.invalidSearchTerm = "Invalider Suchbegriff"
 global.message.missingQueryParams = "Fehlende benötigte query Paramenter."
 global.message.nothingFound = "Nichts gefunden."
@@ -175,7 +174,7 @@ managetags.moveorrename = "Verschieben nach (Umbenennen zu bestehenden)"
 managetags.rename = "Umbenennen"
 managetags.save = reuse.global.save
 managetags.tagfield = "Tagfeld"
-managetags.use = "Nutze"
+managetags.use = "Verwende"
 
 manageuser.addormodify = "Benutzer bearbeiten oder hinzufügen"
 manageuser.availableusers = "Verfügbare Benutzer"
@@ -249,6 +248,7 @@ sysfield.category = "Kategorie"
 sysfield.content = "Haupttext"
 sysfield.countries = "Länder"
 sysfield.coverimage = "Titelbild"
+sysfield.created = "Erstellt"
 sysfield.description = "Beschreibung"
 sysfield.developer = "Entwickler"
 sysfield.directors = "Directoren"
@@ -258,6 +258,8 @@ sysfield.imdbrating = "IMDB Wertung"
 sysfield.isbn = "ISBN"
 sysfield.languages = "Sprachen"
 sysfield.localizedTitle = "Lokalisierter Titel"
+sysfield.missingtemplate = "Fehlende Feldvorlage:"
+sysfield.modified = "Bearbeitet"
 sysfield.os = "Betriebssystem und Version"
 sysfield.platform = "Platform"
 sysfield.publisher = "Verlag"
@@ -271,7 +273,6 @@ sysfield.view = "Ansicht"
 sysfield.viewcount = "Anzeigezähler"
 sysfield.writers = "Autoren"
 sysfield.year = "Jahr"
-sysfield.missingtemplate = "Fehlende Feldvorlage:"
 
 tags.headline.tagsfor = "Tags für:"
 

diff --git a/webclient/i18n/eng.ini b/webclient/i18n/eng.ini
index e605be78a3d94104505d9d8fb7aa48a336a01404..40f7f66be2600e70e29611ce4dc06da0ff412852 100644 (file)
--- a/webclient/i18n/eng.ini
+++ b/webclient/i18n/eng.ini
@@ -43,7 +43,6 @@ global.login = "Login"
 global.message.couldNotBeSaved = "Data could not be saved. See logs for more."
 global.message.couldNotLoadCollection = "Can not load given collection."
 global.message.dataSaved = "Data saved successfully"
-global.message.here = "Here"
 global.message.invalidSearchTerm = "Invalid search term"
 global.message.missingQueryParams = "Missing required query parameters."
 global.message.nothingFound = "Nothing found."
@@ -249,6 +248,7 @@ sysfield.category = "Category"
 sysfield.content = "Main Content"
 sysfield.countries = "Countries"
 sysfield.coverimage = "Cover image"
+sysfield.created = "Created"
 sysfield.description = "Description"
 sysfield.developer = "Developer"
 sysfield.directors = "Directors"
@@ -258,6 +258,8 @@ sysfield.imdbrating = "IMDB rating"
 sysfield.isbn = "ISBN"
 sysfield.languages = "Languages"
 sysfield.localizedTitle = "Localized title"
+sysfield.missingtemplate = "Missing template for:"
+sysfield.modified = "Modified"
 sysfield.os = "Operating system and version"
 sysfield.platform = "Platform"
 sysfield.publisher = "Publisher"
@@ -271,7 +273,6 @@ sysfield.view = "View"
 sysfield.viewcount = "View counter"
 sysfield.writers = "Writers"
 sysfield.year = "Year"
-sysfield.missingtemplate = "Missing template for:"
 
 tags.headline.tagsfor = "Tags for:"
 

diff --git a/webclient/lib/managecollectionfields.class.php b/webclient/lib/managecollectionfields.class.php
index eaaafffc2f41d08d1861ad93de26e423f373ea37..9709e3003ef122fb95921799e8bfcebce2ce60e6 100644 (file)
--- a/webclient/lib/managecollectionfields.class.php
+++ b/webclient/lib/managecollectionfields.class.php
@@ -312,8 +312,8 @@ class ManageCollectionFields {
                }
 
         // add systemfields
-               $def['created'] = array('identifier' => 'created', 'displayname' => 'Created', 'type' => 'systemfield');
-               $def['modified'] = array('identifier' => 'modified', 'displayname' => 'Modified', 'type' => 'systemfield');
+               $def['created'] = array('identifier' => 'created', 'displayname' => 'sysfield.created', 'type' => 'systemfield');
+               $def['modified'] = array('identifier' => 'modified', 'displayname' => 'sysfield.modified', 'type' => 'systemfield');
 
                return $def + $ret;
        }

diff --git a/webclient/lib/trite.class.php b/webclient/lib/trite.class.php
index 31d4d24bfcff41c4fa4c2a9fd6b1ae199e92c535..e7cb7ece974ec3a816ecfebda5d52180224c5030 100644 (file)
--- a/webclient/lib/trite.class.php
+++ b/webclient/lib/trite.class.php
@@ -233,8 +233,8 @@ class Trite {
 
        /**
         * return the simple search fields for loaded collection
-        * Every field witch has a column in the entry table is a simple search field.
-        * Name starts with entry
+        * Every field whitch has a column in the entry table is a simple search field.
+        * Name starts with entry. But no hidden fields
         *
         * @see ManageCollectionFields->getSimpleSearchFields()
         *
@@ -246,15 +246,16 @@ class Trite {
                $fields = $this->getCollectionFields();
                if(!empty($fields)) {
                        foreach($fields as $k=>$v) {
-                               if(isset($v['searchtype']) && strpos($v['searchtype'],'entry') !== false) {
+                               if(isset($v['searchtype']) && strpos($v['searchtype'],'entry') !== false
+                                   && $v['type'] !== 'hidden') {
                                        $ret[$k] = $v;
                                }
                        }
                }
 
         // add systemfields
-               $def['created'] = array('identifier' => 'created', 'displayname' => 'Created', 'type' => 'systemfield');
-               $def['modified'] = array('identifier' => 'modified', 'displayname' => 'Modified', 'type' => 'systemfield');
+               $def['created'] = array('identifier' => 'created', 'displayname' => 'sysfield.created', 'type' => 'systemfield');
+               $def['modified'] = array('identifier' => 'modified', 'displayname' => 'sysfield.modified', 'type' => 'systemfield');
                return $def + $ret;
        }
 

diff --git a/webclient/view/default/tool/tool-googlebooks.html b/webclient/view/default/tool/tool-googlebooks.html
index a465e5f6cd5ee50131769f7222d630c3c932f6dd..04f20ee2ffad778c0f360c5ac2b8fa2a7d6ac559 100644 (file)
--- a/webclient/view/default/tool/tool-googlebooks.html
+++ b/webclient/view/default/tool/tool-googlebooks.html
@@ -1,4 +1,4 @@
-<p><b><?php echo $I18n->t('tool.lomitations'); ?></b></p>
+<p><b><?php echo $I18n->t('tool.limitations'); ?></b></p>
 <p><?php echo $I18n->t('tool.limitations.override'); ?></p>
 
 <form class="uk-form-horizontal uk-margin-small" method="post" enctype="multipart/form-data">

diff --git a/webclient/view/default/tool/tool-googlebooks.php b/webclient/view/default/tool/tool-googlebooks.php
index 7657c8c273aafd8586776603b868fb808ed9b282..0491e96de6b3427a2fdb565cbfdf360f63bab722 100644 (file)
--- a/webclient/view/default/tool/tool-googlebooks.php
+++ b/webclient/view/default/tool/tool-googlebooks.php
@@ -127,7 +127,7 @@ if(isset($_POST['submitFormSave'])) {
                                $_r['group'],
                                $_r['rights']
                        );
-                       $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." <a href='index.php?p=manageentry&collection=".$collection['id']."&id=".$do."'>".$I18n->t('global.message.here')."</a>";
+                       $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." <a href='index.php?p=manageentry&collection=".$collection['id']."&id=".$do."'>".$I18n->t('global.view')."</a>";
                }
 
                if(!empty($do)) {

diff --git a/webclient/view/default/tool/tool-imdbweb.html b/webclient/view/default/tool/tool-imdbweb.html
index c780ebd25d2b5dc323d2c054775303a941d3c2b0..8ab9c63d4c489e1959d8ab4d2db228919cc8f3f6 100644 (file)
--- a/webclient/view/default/tool/tool-imdbweb.html
+++ b/webclient/view/default/tool/tool-imdbweb.html
@@ -1,5 +1,6 @@
-<p><b><?php echo $I18n->t('tool.lomitations'); ?></b></p>
+<p><b><?php echo $I18n->t('tool.limitations'); ?></b></p>
 <p><?php echo $I18n->t('tool.limitations.override'); ?></p>
+<p><a href="http://www.impawards.com/" target=_blank>Movie posters</a></p>
 
 <form class="uk-form-horizontal uk-margin-small" method="post" enctype="multipart/form-data">
        <div class="uk-margin">

diff --git a/webclient/view/default/tool/tool-imdbweb.php b/webclient/view/default/tool/tool-imdbweb.php
index dd46dc8481478ce3a2d9d51ea9c7322f13087402..2189542de7d637f3af2f8772230f6d754a73469a 100644 (file)
--- a/webclient/view/default/tool/tool-imdbweb.php
+++ b/webclient/view/default/tool/tool-imdbweb.php
@@ -137,7 +137,7 @@ if(isset($_POST['submitFormSave'])) {
                                                $_r['group'],
                                                $_r['rights']
                                        );
-                                       $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." <a href='index.php?p=manageentry&collection=".$collection['id']."&id=".$do."'>".$I18n->t('global.message.here')."</a>";
+                                       $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." <a href='index.php?p=manageentry&collection=".$collection['id']."&id=".$do."'>".$I18n->t('global.view')."</a>";
                                }
 
                                if(!empty($do)) {

diff --git a/webclient/view/default/tool/tool-musicbrainz.html b/webclient/view/default/tool/tool-musicbrainz.html
index 08d4967e1f91353b19da92478108e03b8c98695e..a8157a9dca7b97b88fe76a1ef092d179fcc2499a 100644 (file)
--- a/webclient/view/default/tool/tool-musicbrainz.html
+++ b/webclient/view/default/tool/tool-musicbrainz.html
@@ -1,4 +1,4 @@
-<p><b><?php echo $I18n->t('tool.lomitations'); ?></b></p>
+<p><b><?php echo $I18n->t('tool.limitations'); ?></b></p>
 <p><?php echo $I18n->t('tool.music.limitations.override'); ?></p>
 
 <form class="uk-form-horizontal uk-margin-small" method="post" enctype="multipart/form-data">

diff --git a/webclient/view/default/tool/tool-musicbrainz.php b/webclient/view/default/tool/tool-musicbrainz.php
index 7092eabca3c6c3388eb8a511a967bd1a35ee75d0..268203f2b007fe8e174b769e4ec8c210c88e734e 100644 (file)
--- a/webclient/view/default/tool/tool-musicbrainz.php
+++ b/webclient/view/default/tool/tool-musicbrainz.php
@@ -156,7 +156,7 @@ if(isset($_POST['submitFormSave'])) {
                                $_r['group'],
                                $_r['rights']
                        );
-                       $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." <a href='index.php?p=manageentry&collection=".$collection['id']."&id=".$do."'>".$I18n->t('global.message.here')."</a>";
+                       $TemplateData['message']['content'] = $I18n->t('global.message.dataSaved')." <a href='index.php?p=manageentry&collection=".$collection['id']."&id=".$do."'>".$I18n->t('global.view')."</a>";
                }
 
                if(!empty($do)) {