Changed sorting of release notes

smarthomeNG · Jul 27, 2023 · db14ee2 · db14ee2
1 parent 42331d0
commit db14ee2
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 6 deletions.
diff --git a/doc/user/source/release/1_1.rst → doc/user/source/release/1_01.rst b/doc/user/source/release/1_1.rst → doc/user/source/release/1_01.rst
diff --git a/doc/user/source/release/1_2.rst → doc/user/source/release/1_02.rst b/doc/user/source/release/1_2.rst → doc/user/source/release/1_02.rst
diff --git a/doc/user/source/release/1_9.rst → doc/user/source/release/1_09.rst b/doc/user/source/release/1_9.rst → doc/user/source/release/1_09.rst
diff --git a/doc/user/source/release/1_9_1.rst → doc/user/source/release/1_09_1.rst b/doc/user/source/release/1_9_1.rst → doc/user/source/release/1_09_1.rst
diff --git a/doc/user/source/release/1_9_2.rst → doc/user/source/release/1_09_2.rst b/doc/user/source/release/1_9_2.rst → doc/user/source/release/1_09_2.rst
diff --git a/doc/user/source/release/1_9_3.rst → doc/user/source/release/1_09_3.rst b/doc/user/source/release/1_9_3.rst → doc/user/source/release/1_09_3.rst
diff --git a/doc/user/source/release/1_9_4.rst → doc/user/source/release/1_09_4.rst b/doc/user/source/release/1_9_4.rst → doc/user/source/release/1_09_4.rst
diff --git a/doc/user/source/release/1_9_5.rst → doc/user/source/release/1_09_5.rst b/doc/user/source/release/1_9_5.rst → doc/user/source/release/1_09_5.rst
diff --git a/doc/user/source/was_ist_neu.rst b/doc/user/source/was_ist_neu.rst
@@ -47,7 +47,7 @@ Neuerungen bei Plugins
 Bei den Plugins sind folgende Änderungen zu beachten:
 
   - **Plugin smartvisu**: Der Default Wert des Parameters **generate_pages** wurde auf **False** geändert. Zum
-    generieren von Seiten muss dieser Parameter nun aktive konfiguriert werden.
+    generieren von Seiten muss dieser Parameter nun aktiv konfiguriert werden.
   - Es sind auch einige :ref:`neue Plugins <releasenotes_1_10_neue_plugins>` hinzugekommen.
   - Außerdem hat es eine Reihe von :ref:`Updates zu bestehenden Plugins <releasenotes_1_10_updates_plugins>` gegeben.
   - Es sind einige veraltete Plugins :ref:`retired <releasenotes_1_10_retired_plugins>` worden.

diff --git a/modules/admin/api_logics.py b/modules/admin/api_logics.py
@@ -252,6 +252,14 @@ def get_logics_info(self):
         return json.dumps(self.logics_data)
 
 
+    def get_groups_info(self):
+        """
+        Get information of defined groups
+        """
+        self.groups_data = {'groups': self.logics._groups}
+        return json.dumps(self.groups_data)
+
+
     def get_logic_info(self, logicname):
         """
         Get code of a logic from file
@@ -461,10 +469,12 @@ def read(self, logicname=None, infotype=None):
             # SmartHomeNG has not yet initialized the logics module (still starting up)
             raise cherrypy.NotFound
 
-        if logicname is None:
+        if logicname is None and infotype is None:
             return self.get_logics_info()
-        elif infotype is None:
+        elif logicname is not None and infotype is None:
             return self.get_logic_info(logicname)
+        elif logicname is None and infotype == 'groups':
+            return self.get_groups_info()
         elif infotype == 'status':
             return self.get_logic_state(logicname)
 

diff --git a/modules/admin/webif/static/assets/i18n/de.json b/modules/admin/webif/static/assets/i18n/de.json
@@ -255,6 +255,7 @@
     "USERLOGICS": "Nutzerlogiken",
     "SYSTEMLOGICS": "Systemlogiken",
     "GROUP": "Gruppe",
+    "GROUPS": "Gruppen",
     "NOGROUP_TITLE": "Logiken ohne Gruppenzugehörigkeit",
     "LOGIC": "Logik",
     "NEXT_EXEC": "Nächste Ausführung",
@@ -299,7 +300,9 @@
     "TYPE": "Typ",
     "DESCRIPTION": "Beschreibung",
     "ADD_ITEM": "Item hinzufügen",
-    "ITEM_INVALID": "Item ungültig oder bereits in der Liste vorhanden, bitte Eingabe prüfen!"
+    "ITEM_INVALID": "Item ungültig oder bereits in der Liste vorhanden, bitte Eingabe prüfen!",
+    "GROUP_TITLE": "Titel",
+    "GROUP_DESCRIPTION": "Beschreibung"
   },
   "SCHEDULERS": {
     "ITEM SCHEDULERS": "Item Scheduler",
@@ -496,6 +499,7 @@
     "RESTORE": "Wiederherstellen",
     "CLEAR_FILTER": "Filter Löschen",
     "NEW_DEFINITION_FILE": "Neue Datei",
+    "NEW_GROUP": "Neue Gruppe",
     "NEW_LOGIC": "Neue Logik",
     "NEW_LOGGER": "weiterer Logger",
     "NEW_SCENE": "Neue Szene",

diff --git a/modules/admin/webif/static/assets/i18n/en.json b/modules/admin/webif/static/assets/i18n/en.json
@@ -255,6 +255,7 @@
     "USERLOGICS": "User Logics",
     "SYSTEMLOGICS": "System Logics",
     "GROUP": "Group",
+    "GROUPS": "Groups",
     "NOGROUP_TITLE": "Logics without group membership",
     "LOGIC": "Logic",
     "NEXT_EXEC": "Next Execution",
@@ -482,6 +483,7 @@
     "RESTORE": "Restore",
     "CLEAR_FILTER": "Clear Filter",
     "NEW_DEFINITION_FILE": "New File",
+    "NEW_GROUP": "New Group",
     "NEW_LOGIC": "New Logic",
     "NEW_LOGGER": "additional Logger",
     "NEW_SCENE": "New Scene",

diff --git a/modules/admin/webif/static/assets/i18n/fr.json b/modules/admin/webif/static/assets/i18n/fr.json
@@ -250,6 +250,7 @@
     "USERLOGICS": "Logiques utilisateur",
     "SYSTEMLOGICS": "Logiques système",
     "GROUP": "groupe",
+    "GROUPS": "groupes",
     "NOGROUP_TITLE": "Logique sans appartenance à un groupe",
     "LOGIC": "Logique",
     "NEXT_EXEC": "Prochaine exécution",
@@ -478,6 +479,7 @@
     "RESTORE": "Restaurer",
     "CLEAR_FILTER": "Supprimer fultre",
     "NEW_DEFINITION_FILE": "Nouveau fichier",
+    "NEW_GROUP": "Nouveau groupe",
     "NEW_LOGIC": "Nouvelle logique",
     "NEW_LOGGER": "Nouvelle générateur",
     "NEW_SCENE": "Nouvelle scène",

diff --git a/modules/admin/webif/static/index.html b/modules/admin/webif/static/index.html
@@ -17,5 +17,5 @@
 <link rel="stylesheet" href="styles.cdc7be39415b36e71c26.css"></head>
 <body>
   <app-root></app-root>
-<script type="text/javascript" src="runtime.e330f42ab6b744c4debd.js"></script><script type="text/javascript" src="polyfills.ac95705c8ecb4d230bfb.js"></script><script type="text/javascript" src="scripts.e384037e7215c1a5366d.js"></script><script type="text/javascript" src="main.ba3091872f81b1743482.js"></script></body>
+<script type="text/javascript" src="runtime.e330f42ab6b744c4debd.js"></script><script type="text/javascript" src="polyfills.ac95705c8ecb4d230bfb.js"></script><script type="text/javascript" src="scripts.e384037e7215c1a5366d.js"></script><script type="text/javascript" src="main.9a03a505608c7f54a9dd.js"></script></body>
 </html>
diff --git a/modules/admin/webif/static/main.ba3091872f81b1743482.js b/modules/admin/webif/static/main.ba3091872f81b1743482.js