Added AllTopics action to TopicController

muratcakir · muratcakir · commit ab8aa47200ba · 2018-07-12T03:29:46.000+02:00
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/ManufacturerController.cs
@@ -187,7 +187,7 @@ private void PrepareManufacturerModel(ManufacturerModel model, Manufacturer manu
 
 		#region List
 
-		//ajax
+		// AJAX
 		public ActionResult AllManufacturers(string label, int selectedId)
         {
             var manufacturers = _manufacturerService.GetAllManufacturers(true);
diff --git a/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs b/src/Presentation/SmartStore.Web/Administration/Controllers/TopicController.cs
@@ -347,5 +347,46 @@ public ActionResult DeleteConfirmed(int id)
             NotifySuccess(T("Admin.ContentManagement.Topics.Deleted"));
             return RedirectToAction("List");
         }
+
+		// AJAX
+		public ActionResult AllTopics(string label, int selectedId, bool useTitles = false, bool includeWidgets = false)
+		{
+			var query = from x in _topicService.GetAllTopics().SourceQuery
+						where (includeWidgets || !x.RenderAsWidget)
+						select x;
+
+			if (useTitles)
+			{
+				query = query.Where(x => !string.IsNullOrEmpty(x.Title));
+				query = query.OrderBy(x => x.Title);
+			}
+			else
+			{
+				query = query.OrderBy(x => x.SystemName);
+			}
+
+			var topics = query.ToList();
+
+			if (label.HasValue())
+			{
+				var labelTopic = new Topic();
+				if (useTitles)
+					labelTopic.Title = label;
+				else
+					labelTopic.SystemName = label;
+
+				topics.Insert(0, labelTopic);
+			}
+
+			var list = from x in topics
+					   select new
+					   {
+						   id = x.Id.ToString(),
+						   text = useTitles ? x.Title : x.SystemName,
+						   selected = x.Id == selectedId
+					   };
+
+			return new JsonResult { Data = list.ToList(), JsonRequestBehavior = JsonRequestBehavior.AllowGet };
+		}
     }
 }
diff --git a/src/Presentation/SmartStore.Web/Content/skinning/_select2.scss b/src/Presentation/SmartStore.Web/Content/skinning/_select2.scss
@@ -773,12 +773,9 @@ select.is-invalid + .select2:not(.select2-container--open) {
  */
 
 .input-group .select2-container--bootstrap {
-	display: table;
-	table-layout: fixed;
-	position: relative;
+    flex: 1 1 auto;
+    width: 1%;
 	z-index: 2;
-	float: left;
-	width: 100%;
 	margin-bottom: 0;
 	/**
    * Adjust z-index like Bootstrap does to show the focus-box-shadow
diff --git a/src/Presentation/SmartStore.Web/Scripts/smartstore.selectwrapper.js b/src/Presentation/SmartStore.Web/Scripts/smartstore.selectwrapper.js
@@ -2,7 +2,7 @@
 *  Project: SmartStore select wrapper 
 *  Author: Murat Cakir, SmartStore AG
 */
-;
+
 (function ($, window, document, undefined) {
 
 	// Customize select2 defaults
@@ -26,7 +26,7 @@
 				callback(data);
 			}
 		});
-	};
+	}
 
 	$.fn.select2.amd.define('select2/data/lazyAdapter', [
 			'select2/data/array',
@@ -55,7 +55,7 @@
 						// Add the option tag to the select element,
 						// otherwise the current val() will not be resolved.
 						var $option = select.find('option').filter(function (i, elm) {
-							return elm.value == initId;
+							return elm.value === initId;
 						});
 
 						if ($option.length === 0) {
@@ -91,23 +91,23 @@
 
 					list = lists[url];
 
-					var doQuery = function (data) {
-						list = data;
-						if (term) {
-							var isGrouped = data.length && data[0].children;
-							if (isGrouped) {
-								// In a grouped list, find the optgroup marked with "main"
-								var mainGroup = _.find(data, function (x) { return x.children && x.main });
-								data = mainGroup ? mainGroup.children : data[0].children;
-							}
-							list = _.filter(data, function (val) {
-								var rg = new RegExp(term, "i");
-								return rg.test(val.text);
-							});
-						}
-						select.data("loaded", true);
-						callback({ results: list });
-					}
+                    var doQuery = function (data) {
+                        list = data;
+                        if (term) {
+                            var isGrouped = data.length && data[0].children;
+                            if (isGrouped) {
+                                // In a grouped list, find the optgroup marked with "main"
+                                var mainGroup = _.find(data, function (x) { return x.children && x.main; });
+                                data = mainGroup ? mainGroup.children : data[0].children;
+                            }
+                            list = _.filter(data, function (val) {
+                                var rg = new RegExp(term, "i");
+                                return rg.test(val.text);
+                            });
+                        }
+                        select.data("loaded", true);
+                        callback({ results: list });
+                    };
 
 					if (!list) {
 						load(url, initId, doQuery);
@@ -124,35 +124,35 @@
 		}
 	);
 
-	$.fn.selectWrapper = function (options) {
-    	if (options && !_.str.isBlank(options.resetDataUrl) && lists[options.resetDataUrl]) {
-    		lists[options.resetDataUrl] = null;
-    		return this.each(function () { });
-		}
+    $.fn.selectWrapper = function (options) {
+        if (options && !_.str.isBlank(options.resetDataUrl) && lists[options.resetDataUrl]) {
+            lists[options.resetDataUrl] = null;
+            return this.each(function () { });
+        }
 
-		options = options || {};
+        options = options || {};
 
         return this.each(function () {
-			var sel = $(this);
+            var sel = $(this);
 
-            if (sel.data("select2")) { 
+            if (sel.data("select2")) {
                 // skip process if select is skinned already
                 return;
             }
-            
+
             if (Modernizr.touchevents && !sel.hasClass("skin")) {
-            	if (sel.find('option[data-color], option[data-imageurl]').length == 0) {
-					// skip skinning if device is mobile and no rich content exists (color & image)
-            		return;
-            	}
+                if (sel.find('option[data-color], option[data-imageurl]').length === 0) {
+                    // skip skinning if device is mobile and no rich content exists (color & image)
+                    return;
+                }
             }
 
-			var placeholder = getPlaceholder();
+            var placeholder = getPlaceholder();
 
             // following code only applicable to select boxes (not input:hidden)
             var firstOption = sel.children("option").first();
             var hasOptionLabel = firstOption.length &&
-                                    (firstOption[0].attributes['value'] === undefined || _.str.isBlank(firstOption.val()));
+                (firstOption[0].attributes['value'] === undefined || _.str.isBlank(firstOption.val()));
 
             if (placeholder && hasOptionLabel) {
                 // clear first option text in nullable dropdowns.
@@ -166,105 +166,105 @@
                 firstOption = $('<option></option>').prependTo(sel);
             }
 
-			if (!placeholder && hasOptionLabel && firstOption.text() && !sel.data("tags")) {
+            if (!placeholder && hasOptionLabel && firstOption.text() && !sel.data("tags")) {
                 // use first option text as placeholder
                 placeholder = firstOption.text();
                 firstOption.text("");
             }
 
             function renderSelectItem(item, isResult) {
-            	try {
-					var option = $(item.element),
-						imageUrl = option.data('imageurl'),
-						color = option.data('color'),
-						hint = option.data('hint');
-
-					if (imageUrl) {
-            			return $('<span><img class="choice-item-img" src="' + imageUrl + '" />' + item.text + '</span>');
-            		}
-            		else if (color) {
-            			return $('<span><span class="choice-item-color" style="background-color: ' + color + '"></span>' + item.text + '</span>');
-					}
-					else if (hint && isResult) {
-						return $('<span class="select2-option"><span>' + item.text + '</span><span class="option-hint muted float-right">' + hint + '</span></span>');
-					}
-					else {
-						return $('<span class="select2-option">' + item.text + '</span>');
-					}
-            	}
-            	catch (e) { }
-
-            	return item.text;
+                try {
+                    var option = $(item.element),
+                        imageUrl = option.data('imageurl'),
+                        color = option.data('color'),
+                        hint = option.data('hint');
+
+                    if (imageUrl) {
+                        return $('<span><img class="choice-item-img" src="' + imageUrl + '" />' + item.text + '</span>');
+                    }
+                    else if (color) {
+                        return $('<span><span class="choice-item-color" style="background-color: ' + color + '"></span>' + item.text + '</span>');
+                    }
+                    else if (hint && isResult) {
+                        return $('<span class="select2-option"><span>' + item.text + '</span><span class="option-hint muted float-right">' + hint + '</span></span>');
+                    }
+                    else {
+                        return $('<span class="select2-option">' + item.text + '</span>');
+                    }
+                }
+                catch (e) { }
+
+                return item.text;
             }
 
             var opts = {
-                allowClear: !!(placeholder), // assuming that a placeholder indicates nullability
+                allowClear: !!placeholder, // assuming that a placeholder indicates nullability
                 placeholder: placeholder,
-				templateResult: function (item) {
-					return renderSelectItem(item, true);
-				},
-				templateSelection: function (item) {
-					return renderSelectItem(item, false);
-				},
-				closeOnSelect: !(sel.prop('multiple') || sel.data("tags")),
-				adaptContainerCssClass: function (c) {
-					if (_.str.startsWith(c, "select-"))
-						return c;
-					else
-						return null;
-				},
-				adaptDropdownCssClass: function (c) {
-					if (_.str.startsWith("drop-"))
-						return c;
-					else
-						return null;
-				}
-			};
-
-			if (!options.lazy && sel.data("select-url")) {
-				opts.lazy = {
-					url: sel.data("select-url"),
-					loaded: sel.data("select-loaded")
-				}
-			}
+                templateResult: function (item) {
+                    return renderSelectItem(item, true);
+                },
+                templateSelection: function (item) {
+                    return renderSelectItem(item, false);
+                },
+                closeOnSelect: !(sel.prop('multiple') || sel.data("tags")),
+                adaptContainerCssClass: function (c) {
+                    if (_.str.startsWith(c, "select-"))
+                        return c;
+                    else
+                        return null;
+                },
+                adaptDropdownCssClass: function (c) {
+                    if (_.str.startsWith("drop-"))
+                        return c;
+                    else
+                        return null;
+                }
+            };
+
+            if (!options.lazy && sel.data("select-url")) {
+                opts.lazy = {
+                    url: sel.data("select-url"),
+                    loaded: sel.data("select-loaded")
+                };
+            }
 
-			if (!options.init && sel.data("select-init-text") && sel.data("select-selected-id")) {
-				opts.init = {
-					id: sel.data("select-selected-id"),
-					text: sel.data("select-init-text")
-				}
-			}
+            if (!options.init && sel.data("select-init-text") && sel.data("select-selected-id")) {
+                opts.init = {
+                    id: sel.data("select-selected-id"),
+                    text: sel.data("select-init-text")
+                };
+            }
 
-			if ($.isPlainObject(options)) {
-				opts = $.extend({}, opts, options);
-			}
+            if ($.isPlainObject(options)) {
+                opts = $.extend({}, opts, options);
+            }
 
-			if (opts.lazy && opts.lazy.url) {
-				// url specified: load data remotely (lazily on first open)...
-				opts.dataAdapter = $.fn.select2.amd.require('select2/data/lazyAdapter');
-			}
-			else if (opts.ajax && opts.init && opts.init.text && sel.find('option[value="' + opts.init.text + '"]').length === 0) {
-				// In AJAX mode: add initial option when missing
-				sel.append('<option value="' + opts.init.id + '" selected>' + opts.init.text + '</option>');
-			}
+            if (opts.lazy && opts.lazy.url) {
+                // url specified: load data remotely (lazily on first open)...
+                opts.dataAdapter = $.fn.select2.amd.require('select2/data/lazyAdapter');
+            }
+            else if (opts.ajax && opts.init && opts.init.text && sel.find('option[value="' + opts.init.text + '"]').length === 0) {
+                // In AJAX mode: add initial option when missing
+                sel.append('<option value="' + opts.init.id + '" selected>' + opts.init.text + '</option>');
+            }
 
-			sel.select2(opts);
+            sel.select2(opts);
 
-			if (sel.hasClass("autowidth")) {
+            if (sel.hasClass("autowidth")) {
                 // move special "autowidth" class to plugin container,
-            	// so we are able to omit min-width per css
+                // so we are able to omit min-width per css
                 sel.data("select2").$container.addClass("autowidth");
             }
 
-			function getPlaceholder() {
-				return options.placeholder ||
-					sel.attr("placeholder") ||
-					sel.data("placeholder") ||
-					sel.data("select-placeholder");
+            function getPlaceholder() {
+                return options.placeholder ||
+                    sel.attr("placeholder") ||
+                    sel.data("placeholder") ||
+                    sel.data("select-placeholder");
             }
 
         });
 
-    }
+    };
 
 })(jQuery, window, document);

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ private void PrepareManufacturerModel(ManufacturerModel model, Manufacturer manu`
`187`	`187`
`188`	`188`	`#region List`
`189`	`189`
`190`		`- //ajax`
	`190`	`+ // AJAX`
`191`	`191`	`public ActionResult AllManufacturers(string label, int selectedId)`
`192`	`192`	`{`
`193`	`193`	`var manufacturers = _manufacturerService.GetAllManufacturers(true);`