Merge pull request Aspen-Discovery#1871 from catsoup11789/24.07.00

fix for saving fields
PTFS-Europe · Jun 20, 2024 · c28031c · c28031c
2 parents 132032f + 5e2a1e1
commit c28031c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/code/web/interface/themes/responsive/Search/home.tpl b/code/web/interface/themes/responsive/Search/home.tpl
@@ -35,6 +35,17 @@
 			{/foreach}
 		</div>
 
+        {if !empty($isLoggedIn)}
+		    <div class="row text-center" style="margin-top: 2em">
+			    <div class="col-xs-12">
+				    <hr/>
+				    <a class="btn {if !empty($showBrowseContent)}btn-default{else}btn-primary{/if}"  href="#" role="button" title="{translate text='Show Hidden Browse Categories' inAttribute=true isPublicFacing=true}" onclick="return AspenDiscovery.Account.showHiddenBrowseCategories('{$loggedInUser}')">
+					    <i class="fas fa-eye"></i> {translate text='Show Hidden Browse Categories' isPublicFacing=true}
+				    </a>
+			    </div>
+		    </div>
+        {/if}
+
 	    {else}
 		<div class="col-sm-12">
 			<div class="row text-center" id="browse-category-picker">

diff --git a/code/web/interface/themes/responsive/theme.css.tpl b/code/web/interface/themes/responsive/theme.css.tpl
@@ -258,13 +258,13 @@ div.striped > div:nth-child(odd), div.striped > div:nth-child(odd){ldelim}
     background-color: {$browseCategoryPanelColor};
 {rdelim}
 
-.browse-category,#browse-sub-category-menu button, .manual [role="tab"]{ldelim}
+.browse-category,#browse-sub-category-menu button, .manual [role="tab"], .manual .hide-browse-sub-category{ldelim}
     background-color: {$deselectedBrowseCategoryBackgroundColor} !important;
     border-color: {$deselectedBrowseCategoryBorderColor} !important;
     color: {$deselectedBrowseCategoryForegroundColor} !important;
 {rdelim}
 
-.browse-category.selected,.browse-category.selected:hover,#browse-sub-category-menu button.selected,#browse-sub-category-menu button.selected:focus,#browse-sub-category-menu button.selected:hover,#browse-sub-category-menu button:focus,#browse-sub-category-menu button:hover, .manual [role="tab"]:focus, .manual [role="tab"]:hover, .manual [role="tab"][aria-selected="true"]{ldelim}
+.browse-category.selected,.browse-category.selected:hover,#browse-sub-category-menu button.selected,#browse-sub-category-menu button.selected:focus,#browse-sub-category-menu button.selected:hover,#browse-sub-category-menu button:focus,#browse-sub-category-menu button:hover, .manual [role="tab"]:focus, .manual [role="tab"]:hover, .manual [role="tab"][aria-selected="true"], .manual [role="tab"][aria-selected="true"] + .hide-browse-sub-category, .manual .hide-browse-sub-category:hover, .manual .hide-browse-sub-category:focus{ldelim}
     border-color: {$selectedBrowseCategoryBorderColor} !important;
     background-color: {$selectedBrowseCategoryBackgroundColor} !important;
     color: {$selectedBrowseCategoryForegroundColor} !important;

diff --git a/code/web/sys/DataObjectUtil.php b/code/web/sys/DataObjectUtil.php
@@ -145,7 +145,7 @@ static function validateObject($structure, $object) {
 
 	static function updateFromUI($object, $structure, $fieldLocks) {
 		foreach ($structure as $property) {
-			if ($fieldLocks != null && !in_array($property['property'], $fieldLocks)) {
+			if (($fieldLocks != null && !in_array($property['property'], $fieldLocks)) || $fieldLocks == null) {
 				DataObjectUtil::processProperty($object, $property, $fieldLocks);
 			}
 		}