Merge branch 'rc' of https://github.com/BEXIS2/Core into rc

Author: DavidBlaa

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Controllers/API/CurationEntryController.cs

@@ -141,7 +141,7 @@ private static List<CurationLabel> GetCurationLabels()
 
         private static String GetCurationGroupName()
         {
-            var groupName = ModuleManager.GetModuleSettings("DDM").GetValueByKey<string>("curatorsGroupName");
+            var groupName = ModuleManager.GetModuleSettings("DDM").GetValueByKey("curatorsGroupName").ToString();
             if (string.IsNullOrEmpty(groupName))
             {
                 return "curator";

Console/BExIS.Web.Shell/Areas/DCM/BExIS.Modules.Dcm.UI/Views/Form/MetadataEditor.cshtml

@@ -162,15 +162,15 @@
                             <button class="bx-button function bx-disabled" disabled="disabled" title="You can only download the metadata of the latest version directly.">Download Metadata </button>
                             }
 
-                                @*@if (Model.EditRight)
-                        {
-                            <button class="bx-button small function" title="Edit Metadata" onclick="edit()">
-                                <span class="fa fa-pencil"></span>
-                                <span style="padding:5px;">
-                                    Edit Metadata
-                                </span>
-                            </button>
-                        }*@
+                            @if (Model.EditRight)
+                            {
+                                <button class="bx-button small function" title="Edit Metadata" onclick="edit()">
+                                    <span class="fa fa-pencil"></span>
+                                    <span style="padding:5px;">
+                                        Edit Metadata
+                                    </span>
+                                </button>
+                            }
 
                             @Html.CheckBox("showAll", @showOptional, new { OnChange = "switchVisibilityOfOptionalElements()", Name = "showAll", Id = "showAll" })