Update model name in logviewer saved search (#8527)

This commit is contained in:
Bjarne Fyrstenborg
2020-07-31 10:18:24 +02:00
committed by GitHub
parent 37d001c0e8
commit dfe8930653
5 changed files with 73 additions and 47 deletions

View File

@@ -1,11 +1,11 @@
<div>
<p>
<strong>Query:</strong><br/>
{{ model.query }}
{{model.query}}
</p>
<p>
<strong>Name:</strong><br/>
<input style="width: 100%" ng-model="model.name" type="text" name="queryName" ng-change="model.disableSubmitButton = model.name.length === 0"/>
<strong><localize key="general_name">Name</localize>:</strong><br />
<input type="text" class="-full-width-input" ng-model="model.queryName" name="queryName" ng-change="model.disableSubmitButton = model.name.length === 0" />
</p>
</div>

View File

@@ -1,7 +1,7 @@
(function () {
"use strict";
function LogViewerSearchController($location, logViewerResource, overlayService) {
function LogViewerSearchController($location, logViewerResource, overlayService, localizationService) {
var vm = this;
@@ -255,9 +255,8 @@
function addToSavedSearches(){
var overlay = {
const overlay = {
title: "Save Search",
subtitle: "Enter a friendly name for your search query",
closeButtonLabel: "Cancel",
submitButtonLabel: "Save Search",
disableSubmitButton: true,
@@ -266,28 +265,37 @@
submit: function (model) {
//Resource call with two params (name & query)
//API that opens the JSON and adds it to the bottom
logViewerResource.postSavedSearch(model.name, model.query).then(function(data){
logViewerResource.postSavedSearch(model.queryName, model.query).then(function(data){
vm.searches = data;
overlayService.close();
});
},
close: function() {
overlayService.close();
}
close: () => overlayService.close()
};
overlayService.open(overlay);
var labelKeys = [
"general_cancel",
"logViewer_saveSearch",
"logViewer_saveSearchDescription"
];
localizationService.localizeMany(labelKeys).then(values => {
overlay.title = values[1];
overlay.subtitle = values[2],
overlay.submitButtonLabel = values[1],
overlay.closeButtonLabel = values[0],
overlayService.open(overlay);
});
}
function deleteSavedSearch(searchItem) {
var overlay = {
const overlay = {
title: "Delete Saved Search",
subtitle: "Are you sure you wish to delete?",
closeButtonLabel: "Cancel",
submitButtonLabel: "Delete Saved Search",
submitButtonStyle: "danger",
view: "default",
submit: function (model) {
//Resource call with two params (name & query)
//API that opens the JSON and adds it to the bottom
@@ -296,12 +304,23 @@
overlayService.close();
});
},
close: function() {
overlayService.close();
}
close: () => overlayService.close()
};
overlayService.open(overlay);
var labelKeys = [
"general_cancel",
"defaultdialogs_confirmdelete",
"logViewer_deleteSavedSearch"
];
localizationService.localizeMany(labelKeys).then(values => {
overlay.title = values[2];
overlay.subtitle = values[1];
overlay.submitButtonLabel = values[2];
overlay.closeButtonLabel = values[0];
overlayService.open(overlay);
});
}
function back() {
@@ -309,7 +328,6 @@
}
init();
}
angular.module("umbraco").controller("Umbraco.Editors.LogViewer.SearchController", LogViewerSearchController);

View File

@@ -1780,8 +1780,10 @@ Mange hilsner fra Umbraco robotten
<key alias="usedByProperties">Brugt af</key>
</area>
<area alias="logViewer">
<key alias="deleteSavedSearch">Slet gemte søgning</key>
<key alias="logLevels">Log type</key>
<key alias="savedSearches">Gemte søgninger</key>
<key alias="saveSearch">Gem søgning</key>
<key alias="saveSearchDescription">Indtast et navn for din søgebetingelse</key>
<key alias="totalItems">Samlet resultat</key>
<key alias="timestamp">Dato</key>
<key alias="level">Type</key>

View File

@@ -2276,34 +2276,38 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="labelUsedByDocuments">Used in Documents</key>
<key alias="labelUsedByMembers">Used in Members</key>
<key alias="labelUsedByMedia">Used in Media</key>
</area>
</area>
<area alias="logViewer">
<key alias="logLevels">Log Levels</key>
<key alias="savedSearches">Saved Searches</key>
<key alias="totalItems">Total Items</key>
<key alias="timestamp">Timestamp</key>
<key alias="level">Level</key>
<key alias="machine">Machine</key>
<key alias="message">Message</key>
<key alias="exception">Exception</key>
<key alias="properties">Properties</key>
<key alias="searchWithGoogle">Search With Google</key>
<key alias="searchThisMessageWithGoogle">Search this message with Google</key>
<key alias="searchWithBing">Search With Bing</key>
<key alias="searchThisMessageWithBing">Search this message with Bing</key>
<key alias="searchOurUmbraco">Search Our Umbraco</key>
<key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Search this message on Our Umbraco forums and docs</key>
<key alias="searchOurUmbracoWithGoogle">Search Our Umbraco with Google</key>
<key alias="searchOurUmbracoForumsUsingGoogle">Search Our Umbraco forums using Google</key>
<key alias="searchUmbracoSource">Search Umbraco Source</key>
<key alias="searchWithinUmbracoSourceCodeOnGithub">Search within Umbraco source code on Github</key>
<key alias="searchUmbracoIssues">Search Umbraco Issues</key>
<key alias="searchUmbracoIssuesOnGithub">Search Umbraco Issues on Github</key>
<key alias="deleteThisSearch">Delete this search</key>
<key alias="findLogsWithRequestId">Find Logs with Request ID</key>
<key alias="findLogsWithNamespace">Find Logs with Namespace</key>
<key alias="findLogsWithMachineName">Find Logs with Machine Name</key>
<key alias="open">Open</key>
<key alias="deleteSavedSearch">Delete Saved Search</key>
<key alias="logLevels">Log Levels</key>
<key alias="savedSearches">Saved Searches</key>
<key alias="saveSearch">Save Search</key>
<key alias="saveSearchDescription">Enter a friendly name for your search query</key>
<key alias="filterSearch">Filter Search</key>
<key alias="totalItems">Total Items</key>
<key alias="timestamp">Timestamp</key>
<key alias="level">Level</key>
<key alias="machine">Machine</key>
<key alias="message">Message</key>
<key alias="exception">Exception</key>
<key alias="properties">Properties</key>
<key alias="searchWithGoogle">Search With Google</key>
<key alias="searchThisMessageWithGoogle">Search this message with Google</key>
<key alias="searchWithBing">Search With Bing</key>
<key alias="searchThisMessageWithBing">Search this message with Bing</key>
<key alias="searchOurUmbraco">Search Our Umbraco</key>
<key alias="searchThisMessageOnOurUmbracoForumsAndDocs">Search this message on Our Umbraco forums and docs</key>
<key alias="searchOurUmbracoWithGoogle">Search Our Umbraco with Google</key>
<key alias="searchOurUmbracoForumsUsingGoogle">Search Our Umbraco forums using Google</key>
<key alias="searchUmbracoSource">Search Umbraco Source</key>
<key alias="searchWithinUmbracoSourceCodeOnGithub">Search within Umbraco source code on Github</key>
<key alias="searchUmbracoIssues">Search Umbraco Issues</key>
<key alias="searchUmbracoIssuesOnGithub">Search Umbraco Issues on Github</key>
<key alias="deleteThisSearch">Delete this search</key>
<key alias="findLogsWithRequestId">Find Logs with Request ID</key>
<key alias="findLogsWithNamespace">Find Logs with Namespace</key>
<key alias="findLogsWithMachineName">Find Logs with Machine Name</key>
<key alias="open">Open</key>
</area>
<area alias="clipboard">
<key alias="labelForCopyAllEntries">Copy %0%</key>

View File

@@ -2300,9 +2300,11 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="labelUsedByMedia">Used in Media</key>
</area>
<area alias="logViewer">
<key alias="deleteSavedSearch">Delete Saved Search</key>
<key alias="logLevels">Log Levels</key>
<key alias="savedSearches">Saved Searches</key>
<key alias="saveSearch">Save Search</key>
<key alias="saveSearchDescription">Enter a friendly name for your search query</key>
<key alias="filterSearch">Filter Search</key>
<key alias="totalItems">Total Items</key>
<key alias="timestamp">Timestamp</key>