Merge pull request #62 from mattbrailsford/feature/querystring

Fixes #45: Adds querystring support

Author: rasmusjp

src/RJP.MultiUrlPicker.Web.UI/MultiUrlPicker.html

@@ -5,7 +5,7 @@
                 <umb-node-preview icon="link.icon"
                                   name="link.name"
                                   published="link.published"
-                                  description="link.url"
+                                  description="link.url + (link.querystring ? link.querystring : '')"
                                   sortable="!ctrl.sortableOptions.disabled"
                                   allow-remove="true"
                                   allow-open="true"

src/RJP.MultiUrlPicker.Web.UI/MultiUrlPicker.js

@@ -57,6 +57,7 @@
         id: link.isMedia ? null : link.id,
         udi: link.isMedia ? null : link.udi,
         url: link.url,
+        querystring: link.querystring,
         target: link.target
       } : null
 
@@ -65,6 +66,7 @@
         view: 'linkpicker',
         currentTarget: target,
         show: true,
+        querystring: true,
         submit: function (model) {
           if (model.target.url) {
             if (link) {
@@ -80,14 +82,16 @@
               link.name = model.target.name || model.target.url
               link.target = model.target.target
               link.url = model.target.url
+              link.querystring = model.target.querystring
             } else {
               link = {
                 id: model.target.id,
                 isMedia: model.target.isMedia,
                 name: model.target.name || model.target.url,
                 target: model.target.target,
                 udi: model.target.udi,
-                url: model.target.url
+                url: model.target.url,
+                querystring: model.target.querystring
               }
               this.renderModel.push(link)
             }
@@ -115,6 +119,27 @@
     }
   }
 
-  angular.module('umbraco')
-  .controller('RJP.MultiUrlPickerController', MultiUrlPickerController)
+  angular.module('umbraco').controller('RJP.MultiUrlPickerController', MultiUrlPickerController)
+
+  function mupHttpProvider($httpProvider) {
+        
+        $httpProvider.interceptors.push(function ($q) {
+            return {
+                'response': function (response) {
+                    if (response.config.url.indexOf("views/common/overlays/linkpicker/linkpicker.html") !== -1) {
+                        // Inject the querystring field
+                        var $markup = $(response.data);
+                        var $urlField = $markup.find("[label=\"@defaultdialogs_urlLinkPicker\"]");
+                        $urlField.after("<umb-control-group label='Query String' ng-if='model.querystring'><input type='text' placeholder='Query String' class='umb-editor umb-textstring' ng-model='model.target.querystring'/></umb-control-group>");
+                        response.data = $markup[0];
+                    }
+                    return response;
+                }
+            };
+        });
+
+    }
+
+    angular.module("umbraco.services").config(['$httpProvider', mupHttpProvider]);
+
 })()

src/RJP.MultiUrlPicker/Models/Link.cs

@@ -109,6 +109,12 @@ public string Url
                 if (string.IsNullOrEmpty(_url))
                 {
                     _url = PublishedContent?.Url ?? _linkItem.Value<string>("url");
+
+                    var qs = _linkItem.Value<string>("querystring");
+                    if (!string.IsNullOrWhiteSpace(qs))
+                    {
+                        _url += qs;
+                    }
                 }
                 return _url;
             }

src/RJP.MultiUrlPicker/Models/LinkDisplay.cs

@@ -30,5 +30,8 @@ internal class LinkDisplay
 
         [DataMember(Name = "url")]
         public string Url { get; set; }
+
+        [DataMember(Name = "querystring")]
+        public string Querystring { get; set; }
     }
 }

src/RJP.MultiUrlPicker/Models/LinkDto.cs

@@ -28,6 +28,9 @@ internal class LinkDto
         [DataMember(Name = "url")]
         public string Url { get; set; }
 
+        [DataMember(Name = "querystring")]
+        public string Querystring { get; set; }
+
         internal bool Published { get; set; }
     }
 }

src/RJP.MultiUrlPicker/MultiUrlPickerPropertyEditor.cs

@@ -216,6 +216,7 @@ public override object ConvertDbToEditor(Property property, PropertyType propert
                                 Published = published,
                                 Udi = udi,
                                 Url = url,
+                                Querystring = dto.Querystring
                             });
                         }
                         else
@@ -226,7 +227,8 @@ public override object ConvertDbToEditor(Property property, PropertyType propert
                                 Name = dto.Name,
                                 Published = true,
                                 Target = dto.Target,
-                                Url = dto.Url
+                                Url = dto.Url,
+                                Querystring = dto.Querystring
                             });
                         }
                     }
@@ -258,7 +260,8 @@ from link in JsonConvert.DeserializeObject<List<LinkDisplay>>(value)
                             Name = link.Name,
                             Target = link.Target,
                             Udi = link.Udi,
-                            Url = link.Udi == null ? link.Url : null // only save the url for external links
+                            Url = link.Udi == null ? link.Url : null, // only save the url for external links
+                            Querystring = link.Querystring
                         },
                         new JsonSerializerSettings
                         {