From 54ccdf526255ad12bdbfd378e1129cef00722005 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 23 May 2016 12:59:33 +0300
Subject: [PATCH] closes #4651

---
 public/src/admin/manage/category.js           | 96 +++++++++++--------
 src/socket.io/admin/categories.js             |  4 +
 .../admin/partials/categories/privileges.tpl  |  1 +
 3 files changed, 61 insertions(+), 40 deletions(-)

diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index ced83105a3..57dc7be563 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -5,9 +5,8 @@ define('admin/manage/category', [
 	'uploader',
 	'iconSelect',
 	'admin/modules/colorpicker',
-	'autocomplete',
-	'Chart'
-], function(uploader, iconSelect, colorpicker, autocomplete, Chart) {
+	'autocomplete'
+], function(uploader, iconSelect, colorpicker, autocomplete) {
 	var	Category = {};
 
 	Category.init = function() {
@@ -100,46 +99,17 @@ define('admin/manage/category', [
 			});
 		});
 
-		$('.copy-settings').on('click', function(e) {
-			e.preventDefault();
-			socket.emit('admin.categories.getNames', function(err, categories) {
-				if (err) {
-					return app.alertError(err.message);
-				}
-
-				templates.parse('admin/partials/categories/select-category', {
-					categories: categories
-				}, function(html) {
-					function submit() {
-						var formData = modal.find('form').serializeObject();
-
-						socket.emit('admin.categories.copySettingsFrom', {fromCid: formData['select-cid'], toCid: ajaxify.data.category.cid}, function(err) {
-							if (err) {
-								return app.alertError(err.message);
-							}
-							app.alertSuccess('Settings Copied!');
-							ajaxify.refresh();
-						});
-
-						modal.modal('hide');
-						return false;
+		$('.copy-settings').on('click', function() {
+			selectCategoryModal(function(cid) {
+				socket.emit('admin.categories.copySettingsFrom', {fromCid: cid, toCid: ajaxify.data.category.cid}, function(err) {
+					if (err) {
+						return app.alertError(err.message);
 					}
-
-					var modal = bootbox.dialog({
-						title: 'Select a Category',
-						message: html,
-						buttons: {
-							save: {
-								label: 'Copy',
-								className: 'btn-primary',
-								callback: submit
-							}
-						}
-					});
-
-					modal.find('form').on('submit', submit);
+					app.alertSuccess('Settings Copied!');
+					ajaxify.refresh();
 				});
 			});
+			return false;
 		});
 
 		$('.upload-button').on('click', function() {
@@ -229,6 +199,7 @@ define('admin/manage/category', [
 		$('.privilege-table-container').on('click', '[data-action="search.user"]', Category.addUserToPrivilegeTable);
 		$('.privilege-table-container').on('click', '[data-action="search.group"]', Category.addGroupToPrivilegeTable);
 		$('.privilege-table-container').on('click', '[data-action="copyToChildren"]', Category.copyPrivilegesToChildren);
+		$('.privilege-table-container').on('click', '[data-action="copyPrivilegesFrom"]', Category.copyPrivilegesFromCategory);
 
 		Category.exposeAssumedPrivileges();
 	};
@@ -397,5 +368,50 @@ define('admin/manage/category', [
 		});
 	};
 
+	Category.copyPrivilegesFromCategory = function() {
+		selectCategoryModal(function(cid) {
+			socket.emit('admin.categories.copyPrivilegesFrom', {toCid: ajaxify.data.category.cid, fromCid: cid}, function(err) {
+				if (err) {
+					return app.alertError(err.message);
+				}
+				ajaxify.refresh();
+			});
+		});
+	};
+
+	function selectCategoryModal(callback) {
+		socket.emit('admin.categories.getNames', function(err, categories) {
+			if (err) {
+				return app.alertError(err.message);
+			}
+
+			templates.parse('admin/partials/categories/select-category', {
+				categories: categories
+			}, function(html) {
+				function submit() {
+					var formData = modal.find('form').serializeObject();
+					callback(formData['select-cid']);
+					modal.modal('hide');
+					return false;
+				}
+
+				var modal = bootbox.dialog({
+					title: 'Select a Category',
+					message: html,
+					buttons: {
+						save: {
+							label: 'Copy',
+							className: 'btn-primary',
+							callback: submit
+						}
+					}
+				});
+
+				modal.find('form').on('submit', submit);
+			});
+		});
+	}
+
+
 	return Category;
 });
\ No newline at end of file
diff --git a/src/socket.io/admin/categories.js b/src/socket.io/admin/categories.js
index 3b35847366..4061bb001a 100644
--- a/src/socket.io/admin/categories.js
+++ b/src/socket.io/admin/categories.js
@@ -112,4 +112,8 @@ Categories.copySettingsFrom = function(socket, data, callback) {
 	categories.copySettingsFrom(data.fromCid, data.toCid, callback);
 };
 
+Categories.copyPrivilegesFrom = function(socket, data, callback) {
+	categories.copyPrivilegesFrom(data.fromCid, data.toCid, callback);
+};
+
 module.exports = Categories;
\ No newline at end of file
diff --git a/src/views/admin/partials/categories/privileges.tpl b/src/views/admin/partials/categories/privileges.tpl
index b5605c0935..497fa71ac0 100644
--- a/src/views/admin/partials/categories/privileges.tpl
+++ b/src/views/admin/partials/categories/privileges.tpl
@@ -58,6 +58,7 @@
 								<div class="btn-toolbar">
 									<button type="button" class="btn btn-primary pull-right" data-ajaxify="false" data-action="search.group"> Add Group</button>
 									<button type="button" class="btn btn-info pull-right" data-ajaxify="false" data-action="copyToChildren"> Copy to Children</button>
+									<button type="button" class="btn btn-info pull-right" data-ajaxify="fakse" data-action="copyPrivilegesFrom"> Copy From Category</button>
 								</div>
 							</td>
 						</tr>