Merge pull request #26 from DNNCommunity/development

Merging into master for 7.2.1 release

Author: valadas

.github/CONTRIBUTING.md

@@ -0,0 +1,75 @@
+# How to contribute
+
+Community contributions are essential part of any open source project. The
+community has access to a large number of unique configurations which would
+be extremely difficult for the core maintainers to reproduce. We want to keep 
+it as easy as possible to contribute changes that get things working in your 
+environment. There are a few guidelines that we need contributors to follow 
+so that we can have a chance of keeping on top of things.
+
+## Getting Started
+
+
+* Make sure you have a [GitHub account](https://github.com/signup/free)
+* **Submit an issue** for your issue, assuming one does not already exist. If you have the rights, you should assign yourself to the issue. If you do not have that ability please add a comment noting that a pull request will be submitted for the issue. After review, if the pull request is accepted, we will mark the issue as resolved and assign it to a release so it can be QA'ed.
+  * Clearly describe the issue including steps to reproduce when it is a bug.
+  * Make sure you fill in the earliest version that you know has the issue.
+* Fork the repository on GitHub
+
+## Making Changes
+
+* Create a topic branch from where you want to base your work.
+  * This is usually the 'development' branch.
+  * Release branches should only be targeted by official committers.
+  * To quickly create a topic branch based on development; `git checkout -b my_contribution development`
+* Make commits of logical units.
+* Check for unnecessary whitespace with `git diff --check` before committing.
+* Make sure your commit messages are in the proper format
+* For bonus points run and add unit tests
+	* Make sure you have added the necessary tests for your changes.
+	* Run _all_ the tests to assure nothing else was accidentally broken.
+
+
+## Making Trivial Changes
+
+### Documentation
+
+For changes of a trivial nature to comments and documentation, it is not
+always necessary to create a new ticket in the issue tracker. In this case, it is appropriate to start the first line of a commit with '(doc)' instead of
+a ticket number. 
+
+````
+    (doc) Add documentation commit example to CONTRIBUTING
+
+    There is no example for contributing a documentation commit
+    to the DNN repository. This is a problem because the contributor
+    is left to assume how a commit of this nature may appear.
+
+    The first line is a real life imperative statement with '(doc)' in
+    place of what would have been the ticket number in a 
+    non-documentation related commit. The body describes the nature of
+    the new documentation or comments added.
+````
+
+## Submitting Changes
+
+* Sign the [Contributor License Agreement](http://www.dnnsoftware.com).
+* Push your changes to a topic branch in your fork of the repository.
+* Submit a pull request to the DNN.Platform repository in the DNNSoftware organization.
+* The committers will handle updating the associated issue in the DNN Tracker to ensure it gets the necessary code review and QA.
+
+## Acceptance of your Changes
+* We have a group of fellow developers that review pull requests submitted by developers like yourself.
+* If your changes look good, then changes are merged to an appropriate release.
+* We may ask you to make further changes or reject the change (with proper reasonsing - we hope that's not the case though).
+* You should get an email notification as we complete processing of your pull request.
+
+## Downloading latest package with your changes
+* As soon as changes are accepted, our team city build server gets into action.
+* New builds are usually available within 10 minutes of acceptance.
+
+# Additional Resources
+
+* [Contributor License Agreement](http://www.dnnsoftware.com)
+* [General GitHub documentation](http://help.github.com/)
+* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+## Describe the bug
+A clear and concise description of what the bug is.
+
+
+## Software Versions
+- DNN: 00.00.00
+- Module: 00.00.00
+
+
+## To Reproduce
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+
+## Expected behavior
+A clear and concise description of what you expected to happen.
+
+
+## Screenshots
+If applicable, add screenshots to help explain your problem.
+
+
+## Error log
+**Note: Debug DLL's**
+Please replace the current extension DLL's with the debug DLL's (if these are available with the release) and reproduce the error with the debug DLL's before pasting the error log.
+
+Paste the error log that is related to this issue.
+
+
+## Additional context
+Add any other context about the problem here.
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+## Is your feature request related to a problem?
+**Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+## Describe the solution you'd like
+A clear and concise description of what you want to happen.
+
+## Describe alternatives you've considered
+A clear and concise description of any alternative solutions or features you've considered.
+
+## Additional context
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/help-and-other-questions.md

@@ -0,0 +1,16 @@
+---
+name: Help and other questions
+about: Ask for help or others questions re. using the module
+
+---
+
+## Please summarize your question in one sentence
+
+
+## Give a more extended description
+
+
+## Steps to reproduce (if needed)
+
+
+## Other comments or remarks

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+<!-- 
+Explain the benefit of this pull request
+You can erase any parts of this template not applicable to your Pull Request. 
+-->
+
+### Description of PR...
+
+## Changes made
+- Item 1
+- Item 2
+
+
+## PR Template Checklist
+
+- [ ] Fixes Bug
+- [ ] Feature solution
+- [ ] Other
+
+
+## Please mark which issue is solved
+<!-- Type numbers directly after the #, it will show the issues with that number -->
+
+Close #

AssemblyInfo.cs

@@ -8,6 +8,6 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyVersion("07.02.00.00")]
+[assembly: System.Reflection.AssemblyVersion("07.02.01.00")]
 
 

Components/Business/AnnouncementInfo.cs

@@ -360,11 +360,9 @@ public string GetProperty(string strPropertyName, string strFormat, CultureInfo
                 case "edit":
                     if (IsEditable)
                     {
-                        string editUrl = Globals.NavigateURL(portalSettings.ActiveTab.TabID, false, portalSettings,
-                                                                               "Edit",
-                                                                               CultureInfo.CurrentCulture.Name,
-                                                                               "mid=" + ModuleID.ToString(CultureInfo.InvariantCulture),
-                                                                               "itemid=" + ItemID.ToString(CultureInfo.InvariantCulture));
+                        string editUrl = Globals.NavigateURL("Edit",
+                            $"mid={ModuleID.ToString(CultureInfo.InvariantCulture)}",
+                            $"itemid={ItemID.ToString(CultureInfo.InvariantCulture)}");
                         if (portalSettings.EnablePopUps)
                         {
                             editUrl = UrlUtils.PopUpUrl(editUrl, null, portalSettings, false, false);
@@ -391,11 +389,11 @@ public string GetProperty(string strPropertyName, string strFormat, CultureInfo
                     }
 
                     //Retrieve the path to the imagefile
-                    if (strValue != "")
+                    if (!string.IsNullOrEmpty(strValue))
                     {
                         //Get path from filesystem only when the image comes from within DNN.
                         // this is now legacy, from version 7.0.0, a real filename is saved in the DB
-                        if (ImageSource.StartsWith("FileID="))
+                        if (ImageSource != null && ImageSource.StartsWith("FileID="))
                         {
 
                             var objFile = FileManager.Instance.GetFile(Convert.ToInt32(strValue.Substring(7)));
@@ -410,14 +408,24 @@ public string GetProperty(string strPropertyName, string strFormat, CultureInfo
                         }
                         else
                         {
-                            if (!ImageSource.ToLowerInvariant().StartsWith("http"))
+                            if (ImageSource != null && !ImageSource.ToLowerInvariant().StartsWith("http"))
                             {
                                 strValue = portalSettings.HomeDirectory + ImageSource;
                             }
                         }
-                        strValue = PropertyAccess.FormatString(strValue, strFormat);
+                        if (strValue != null)
+                        {
+                            strValue = PropertyAccess.FormatString(strValue, strFormat);
+                        }
+                    }
+                    if (strValue == null)
+                    {
+                        return "";
+                    }
+                    else
+                    {
+                        return strValue;
                     }
-                    return strValue;
                 case "vieworder":
                     return (ViewOrder.ToString(outputFormat, formatProvider));
                 case "createdbyuserid":

Components/Settings/Settings.cs

@@ -36,6 +36,7 @@
 
 namespace DotNetNuke.Modules.Announcements.Components.Settings
 {
+    [Serializable]
     public class Settings
     {
         #region constants