From 698e77e0cbf78f1b4b97bdd9c715a29b4fde649b Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Tue, 21 Aug 2018 17:22:58 +0200
Subject: [PATCH] Implement reset user preferences for admin toolbar actions

---
 api/js/etemplate/et2_widget_toolbar.js         | 2 +-
 api/src/Etemplate/Widget/Toolbar.php           | 3 +++
 api/templates/default/toolbarAdminSettings.xet | 4 ++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/api/js/etemplate/et2_widget_toolbar.js b/api/js/etemplate/et2_widget_toolbar.js
index bf54f09c00..afbf5d41c8 100644
--- a/api/js/etemplate/et2_widget_toolbar.js
+++ b/api/js/etemplate/et2_widget_toolbar.js
@@ -713,7 +713,7 @@ var et2_toolbar = (function(){ "use strict"; return et2_DOMWidget.extend([et2_II
 		];
 		var self = this;
 		var sel_options = {actions:[]};
-		var content = {actions:[]};
+		var content = {actions:[], reset:false};
 		for (var key in _actions)
 		{
 			if (_actions[key]['children'] && this.flat_list)
diff --git a/api/src/Etemplate/Widget/Toolbar.php b/api/src/Etemplate/Widget/Toolbar.php
index 46bc3e8d7e..3356208bbb 100644
--- a/api/src/Etemplate/Widget/Toolbar.php
+++ b/api/src/Etemplate/Widget/Toolbar.php
@@ -81,6 +81,9 @@ class Toolbar extends Etemplate\Widget
 					$GLOBALS['egw']->preferences->save_repository(true, 'default');
 					$GLOBALS['egw']->preferences->read(true);
 					break;
+				case 'reset':
+					if ($setting) $GLOBALS['egw']->preferences->change_preference($app, $id,'', null, 'user');
+					break;
 				default:
 			}
 		}
diff --git a/api/templates/default/toolbarAdminSettings.xet b/api/templates/default/toolbarAdminSettings.xet
index 849305eb2a..54b0b62e77 100644
--- a/api/templates/default/toolbarAdminSettings.xet
+++ b/api/templates/default/toolbarAdminSettings.xet
@@ -13,6 +13,10 @@
 					<description value="default visible actions" label="%s:"/>
 					<taglist id="actions" editModeEnabled="false" allowFreeEntries="false" autocomplete_url=' ' class="et2_fullWidth"/>
 				</row>
+				<row>
+					<description value="reset all to default" label="%s:"/>
+					<checkbox id="reset" statustext="This will reset toolbar preferences for all users and set them to configured default prefs."/>
+				</row>
 			</rows>
 		</grid>
 	</template>