Skip to content

Commit 890949d

Browse files
committed
Add roleGroup to structure results, and move structure controller to admin
1 parent 19c56cc commit 890949d

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

Diff for: search-solr/src/main/java/edu/unc/lib/boxc/search/solr/config/SearchSettings.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class SearchSettings extends AbstractSettings {
7373
// Set of field keys to use in structure result sets
7474
public static final List<String> RESULT_FIELDS_STRUCTURE = Arrays.asList(SearchFieldKey.ID.name(),
7575
SearchFieldKey.TITLE.name(), SearchFieldKey.RESOURCE_TYPE.name(), SearchFieldKey.ANCESTOR_PATH.name(),
76-
SearchFieldKey.PARENT_COLLECTION.name());
76+
SearchFieldKey.PARENT_COLLECTION.name(), SearchFieldKey.ROLE_GROUP.name());
7777

7878
// Set of fields which can be used in range search criteria
7979
public static final Set<String> FIELDS_RANGE_SEARCHABLE = Set.of(

Diff for: web-common/src/main/java/edu/unc/lib/boxc/web/common/controllers/structure/StructureResultsController.java renamed to web-admin-app/src/main/java/edu/unc/lib/boxc/web/admin/controllers/structure/StructureResultsController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package edu.unc.lib.boxc.web.common.controllers.structure;
16+
package edu.unc.lib.boxc.web.admin.controllers.structure;
1717

1818
import static edu.unc.lib.boxc.auth.fcrepo.services.GroupsThreadStore.getAgentPrincipals;
1919
import static edu.unc.lib.boxc.model.fcrepo.ids.RepositoryPaths.getContentRootPid;

Diff for: web-admin-app/src/main/webapp/WEB-INF/uiapp-servlet.xml

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
<!-- Import controllers -->
2222
<context:component-scan base-package="edu.unc.lib.boxc.web.admin.controllers" />
23-
<context:component-scan base-package="edu.unc.lib.boxc.web.common.controllers.structure" />
2423

2524
<mvc:annotation-driven/>
2625
</beans>

0 commit comments

Comments
 (0)