Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Feb 2, 2019 · ff8aad6 · ff8aad6
2 parents f0e317a + 7951452
commit ff8aad6
Show file tree

Hide file tree

Showing 87 changed files with 3,267 additions and 1,879 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/ReportPeerQueryInterceptor.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/ReportPeerQueryInterceptor.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
@@ -67,7 +67,6 @@
 import org.springframework.web.context.request.RequestContextListener;
 import org.springframework.web.filter.DelegatingFilterProxy;
 
-import com.evolveum.midpoint.gui.impl.util.ReportPeerQueryInterceptor;
 import com.evolveum.midpoint.init.StartupConfiguration;
 import com.evolveum.midpoint.model.api.authentication.NodeAuthenticationEvaluator;
 import com.evolveum.midpoint.util.logging.Trace;
@@ -246,21 +245,11 @@ public ServletRegistrationBean<CXFServlet> cxfServlet() {
         return registration;
     }
 
-    @Bean
-    public ServletRegistrationBean<ReportPeerQueryInterceptor> reportPeerQueryInterceptor() {
-        ServletRegistrationBean<ReportPeerQueryInterceptor> registration = new ServletRegistrationBean<>();
-        registration.setServlet(new ReportPeerQueryInterceptor(nodeAuthenticator));
-        registration.addUrlMappings("/report");
-
-        return registration;
-    }
-
     @Bean
     public ErrorPageRegistrar errorPageRegistrar() {
     	return new MidPointErrorPageRegistrar();
     }
 
-
     @Component
     public class ServerCustomization implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
 

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
@@ -181,13 +181,13 @@ protected void onUpdate(AjaxRequestTarget target) {
         getMainForm().add(reportTypeSelect);
 
 
-        AjaxDownloadBehaviorFromStream ajaxDownloadBehavior = new AjaxDownloadBehaviorFromStream() {
+        ajaxDownloadBehavior = new AjaxDownloadBehaviorFromStream() {
 
         	private static final long serialVersionUID = 1L;
 
             @Override
             protected InputStream initStream() {
-                return createReport(this);
+                return createReport();
             }
 
             @Override
@@ -204,11 +204,6 @@ protected List<InlineMenuItem> createRowActions() {
         return PageCreatedReports.this.initInlineMenu();
     }
 
-    @Override
-    protected List<IColumn<SelectableBean<ReportOutputType>, String>> initColumns() {
-        return PageCreatedReports.this.initColumns(ajaxDownloadBehavior);
-    }
-
     @Override
     protected void objectDetailsPerformed(AjaxRequestTarget target, ReportOutputType object) {
         // TODO Auto-generated method stub
@@ -257,9 +252,8 @@ public PageBase getPageBase() {
     }
 
     //TODO - consider adding Author name, File Type and ReportType to columns
-    private List<IColumn<SelectableBean<ReportOutputType>, String>> initColumns(
-            final AjaxDownloadBehaviorFromStream ajaxDownloadBehavior) {
-        List<IColumn<SelectableBean<ReportOutputType>, String>> columns = new ArrayList<>();
+    protected List<IColumn<SelectableBean<ReportOutputType>, String>> initColumns() {
+            List<IColumn<SelectableBean<ReportOutputType>, String>> columns = new ArrayList<>();
 
          IColumn<SelectableBean<ReportOutputType>, String> column = new PropertyColumn<>(createStringResource("pageCreatedReports.table.description"), "value.description");
         columns.add(column);
@@ -489,8 +483,8 @@ private ObjectQuery appendTypeFilter(ObjectQuery query) {
     	return query;
     }
 
-    private InputStream createReport(AjaxDownloadBehaviorFromStream ajaxDownloadBehaviorFromStream) {
-		return createReport(currentReport, ajaxDownloadBehaviorFromStream, this);
+    private InputStream createReport() {
+		return createReport(currentReport, ajaxDownloadBehavior, this);
 	}
 
 	public static InputStream createReport(ReportOutputType report, AjaxDownloadBehaviorFromStream ajaxDownloadBehaviorFromStream, PageBase pageBase) {

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
@@ -693,6 +693,7 @@ ObjectTypeGuiDescriptor.case=Případ
 ObjectTypeGuiDescriptor.valuePolicy=Politika hodnot
 ObjectTypeGuiDescriptor.functionLibrary=Knihovna funkcí
 ObjectTypeGuiDescriptor.objectCollection=Sbírka objektů
+ObjectTypeGuiDescriptor.archetype=Pravzor
 ObjectTypeGuiDescriptor.unknown=Není nastaveno
 operation.com.evolveum.midpoint.common.crypto.CryptoUtil.securitySelfTest=Bezpečnostní samotest
 operation.com.evolveum.midpoint.common.operation.import.object=Importovat objekt
@@ -1619,7 +1620,7 @@ PageDashboard.assignments=Má přiřazení
 PageDashboard.personalInfo=Osobní informace
 PageDashboard.serverLoad=Zátěž serveru
 PageDashboard.systemInfo=Stav systému
-PageDashboard.title=Nástěnka
+PageDashboard.title=Nástěnky
 PageDashboard.usedRam=Využitá RAM
 PageDashboard.workItems=Moje pracovní položky
 PageDashboard.infobox.users.label=Uživatelé
@@ -1644,11 +1645,18 @@ PageDashboard.infobox.resources.total=celkem
 PageDashboard.infobox.tasks.label=Úlohy
 PageDashboard.infobox.tasks.number=aktivní
 PageDashboard.infobox.tasks.total=celkem
+PageDashboard.infobox.modifications.label=Změny
+PageDashboard.infobox.modifications.number=úspěšné
+PageDashboard.infobox.errors.label=Chyby
+PageDashboard.infobox.errors.number=neúspěšné
+PageDashboard.infobox.moreInfo=Více informací
 PageDashboard.search.input=Zadejte název k hledání
 PageDashboard.search.users=Uživatelé
 PageDashboard.search.resources=Aplikace
 PageDashboard.search.roles=Role
 PageDashboard.search.tasks=Úlohy
+PageDashboardInfo.title=Informační nástěnka
+PageDashboardAdmin.title=Administrátorská nástěnka
 pageDebugList.button.clear=Vyčistit
 pageDebugList.button.search=Hledat
 pageDebugList.description=Popis
@@ -1744,6 +1752,7 @@ PageInternals.title.timeChange=Změna času
 PageInternals.tolerateUndeclaredPrefixes=Tolerovat nedeklarované prefixy v položkách QName a v cestách
 PageInternals.title.counters=Výkonnostní počitadla
 PageInternals.title.traces=Trasování výkonu
+PageInternals.modelProfiling=Profilování modelu
 InternalOperationClasses.resourceSchemaOperations=Činnosti schématu aplikace
 InternalOperationClasses.connectorOperations=Činnosti konektoru
 InternalOperationClasses.shadowFetchOperations=Činnosti získávání stínového účtu
@@ -3403,7 +3412,9 @@ WorkItemsPanel.started=Proces spuštěn
 WorkItemsPanel.created=Vytvořeno
 WorkItemsPanel.deadline=Uzávěrka
 WorkItemsPanel.escalationLevel=Úroveň eskalace
-PageAdmin.menu.dashboard=Nástěnka
+PageAdmin.menu.dashboard=Nástěnky
+PageAdmin.menu.dashboard.info=Informační nástěnka
+PageAdmin.menu.dashboard.admin=Administrátorská nástěnka
 PageAdmin.menu.selfDashboard=Domů
 PageAdmin.menu.selfService=Samoobsluha
 PageAdmin.menu.mainNavigation=Nabídka