From 446b69cb0c6800141dd260c4186abd44aecf5a16 Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Mon, 29 Jun 2020 13:32:48 +0200
Subject: [PATCH] rename "Settings"-Context to "Usersettings"-Context

---
 .../Usersettings_entity.aod}                              | 4 ++--
 .../recordcontainers/jdito/onInsert.js                    | 0
 .../Settings.aod => Usersettings/Usersettings.aod}        | 8 ++++----
 .../UsersettingsEdit_view.aod}                            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename entity/{Settings_entity/Settings_entity.aod => Usersettings_entity/Usersettings_entity.aod} (87%)
 rename entity/{Settings_entity => Usersettings_entity}/recordcontainers/jdito/onInsert.js (100%)
 rename neonContext/{Settings/Settings.aod => Usersettings/Usersettings.aod} (75%)
 rename neonView/{SettingsEdit_view/SettingsEdit_view.aod => UsersettingsEdit_view/UsersettingsEdit_view.aod} (94%)

diff --git a/entity/Settings_entity/Settings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
similarity index 87%
rename from entity/Settings_entity/Settings_entity.aod
rename to entity/Usersettings_entity/Usersettings_entity.aod
index 6480beddf6..eb65941d79 100644
--- a/entity/Settings_entity/Settings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_entity.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.14" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.14">
-  <name>Settings_entity</name>
+  <name>Usersettings_entity</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <title>Settings</title>
   <titlePlural>Settings</titlePlural>
@@ -17,7 +17,7 @@
     <jDitoRecordContainer>
       <name>jdito</name>
       <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
-      <onInsert>%aditoprj%/entity/Settings_entity/recordcontainers/jdito/onInsert.js</onInsert>
+      <onInsert>%aditoprj%/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js</onInsert>
       <recordFieldMappings>
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
diff --git a/entity/Settings_entity/recordcontainers/jdito/onInsert.js b/entity/Usersettings_entity/recordcontainers/jdito/onInsert.js
similarity index 100%
rename from entity/Settings_entity/recordcontainers/jdito/onInsert.js
rename to entity/Usersettings_entity/recordcontainers/jdito/onInsert.js
diff --git a/neonContext/Settings/Settings.aod b/neonContext/Usersettings/Usersettings.aod
similarity index 75%
rename from neonContext/Settings/Settings.aod
rename to neonContext/Usersettings/Usersettings.aod
index 496444744e..e5ed3a702a 100644
--- a/neonContext/Settings/Settings.aod
+++ b/neonContext/Usersettings/Usersettings.aod
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
-  <name>Settings</name>
+  <name>Usersettings</name>
   <title>Settings</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <editView>SettingsEdit_view</editView>
-  <entity>Settings_entity</entity>
+  <editView>UsersettingsEdit_view</editView>
+  <entity>Usersettings_entity</entity>
   <references>
     <neonViewReference>
       <name>40cbd631-043c-44d9-b79b-e7675b69bf7f</name>
-      <view>SettingsEdit_view</view>
+      <view>UsersettingsEdit_view</view>
     </neonViewReference>
   </references>
 </neonContext>
diff --git a/neonView/SettingsEdit_view/SettingsEdit_view.aod b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
similarity index 94%
rename from neonView/SettingsEdit_view/SettingsEdit_view.aod
rename to neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
index a18ae06e1b..2625a04f4d 100644
--- a/neonView/SettingsEdit_view/SettingsEdit_view.aod
+++ b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
-  <name>SettingsEdit_view</name>
+  <name>UsersettingsEdit_view</name>
   <title>Settings</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <layout>
-- 
GitLab