Merge branch 'develop'

Author: collectiveaccess

.htaccess

@@ -10,7 +10,7 @@ Allow from all
 <FilesMatch "^(index|service|tilepic)\.php$">
         Allow from all
 </FilesMatch>
-<FilesMatch "^.*\.(css|gif|jpg|png|js|woff|woff2|ttf|swf|map|tif|tiff|m4v|xml|ply|stl|html|json|mp3|wav|aiff|tiff|obj|bmp|mp4)$">
+<FilesMatch "^.*\.(css|gif|jpg|png|js|woff|woff2|ttf|swf|map|tif|tiff|m4v|xml|ply|stl|html|json|mp3|wav|aiff|tiff|obj|bmp|mp4|pdf)$">
         Allow from all
 </FilesMatch>
 

app/conf/app.conf

@@ -212,7 +212,7 @@ ca_movements_disable_quickadd = 0
 disable_add_object_to_lot_inspector_controls = 0
 
 # ----------------------------------
-# Show "add child record" control in the inspector?
+# Show related counts in the inspector?
 # ----------------------------------
 #
 ca_objects_show_related_counts_in_inspector_for = []
@@ -225,6 +225,20 @@ ca_loans_show_related_counts_in_inspector_for = []
 ca_movements_show_related_counts_in_inspector_for = []
 ca_tour_stops_show_related_counts_in_inspector_for = []
 
+# ---------------------------------------------------
+# Show "add child record" control in editor inspector?
+# ----------------------------------------------------
+#
+ca_objects_show_add_child_control_in_inspector = 0
+ca_entities_show_add_child_control_in_inspector = 0
+ca_places_show_add_child_control_in_inspector = 1
+ca_occurrences_show_add_child_control_in_inspector = 0
+ca_collections_show_add_child_control_in_inspector = 1
+ca_storage_locations_show_add_child_control_in_inspector = 1
+ca_loans_show_add_child_control_in_inspector = 0
+ca_movements_show_add_child_control_in_inspector = 0
+ca_tour_stops_show_add_child_control_in_inspector = 0
+
 # -------------------------
 # Set duplication disable
 # ------------------------- 
@@ -355,7 +369,25 @@ ca_collections_hierarchy_summary_sort_values =
 #
 ca_storage_locations_hierarchy_browser_hide_root = 0
 ca_places_locations_hierarchy_browser_hide_root = 0
-                                                     
+                          
+                          
+# ------------------------------------
+# Show/Hide child records in search/browse results
+# ------------------------------------
+#
+# Normally all results, regardless of their position in a hierarchy are displayed
+# in search/browse results. Set this option for alternative policies. Possible
+# settings are:
+#		show			= 	show all results by default; allow user to filter children if they wish
+#		hide			=   hide all child records (those that are not at the top of their hierarchy) by default; allow user to remove filtering if desired
+#		alwaysShow 		=	show all results; do not allow filtering
+#		alwaysHide		=	hide all child records; do not allow the user to disable filtering
+#
+# "alwaysShow" is the default.
+#
+# While this option may be set for any table, it is typically used only for objects.
+#
+ca_objects_children_display_mode_in_results = alwaysShow
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
@@ -568,6 +600,14 @@ quicksearch_breakout_by_type =
 # Switch to disable out of process search indexing
 #
 disable_out_of_process_search_indexing = 0
+
+# -------------------
+# Caption formatting for object search/browse "thumbnail" results
+# -------------------
+# Set a display template here to customize display of captions under thumbnails in the thumbnail result view. The 
+# template will be evaluated relative to each object in the result set.
+#
+ca_objects_results_thumbnail_caption_template = ^ca_objects.preferred_labels.name%truncate=27&ellipsis=1<br/><l>^ca_objects.idno</l>
 
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

app/conf/search_indexing.conf

@@ -7,6 +7,7 @@
 #	DONT_INCLUDE_IN_SEARCH_FORM 	(causes field to not be includable in user-defined search forms)
 #	BOOST							(numeric "boost" value to index field with; higher values will cause search hits on the boosted field to count for more when sorting by relevance)
 #	INDEX_AS_IDNO					(causes value to be indexed with various permutations for flexible retrieval as a record identifer)
+#	INDEX_AS_MIMETYPE				(causes value to be indexed as a mimetype, including both the literal mimetype and the display text value for the type)
 #	INDEX_ANCESTORS					(enables hierarchical indexing for field, assuming it is in an hierarchical table, resulting in all values for this field in 
 #									 records above the subject in the hierarchy being indexing against the subject)
 #	INDEX_ANCESTORS_START_AT_LEVEL  (forces hierarchical indexing to start X levels down from the root. This allows you to omit the very highest, and least selective, levels of
@@ -330,7 +331,7 @@ ca_objects = {
 		fields = {
 			representation_id = { DONT_INCLUDE_IN_SEARCH_FORM },
 			media_content = { DONT_INCLUDE_IN_SEARCH_FORM },
-			mimetype = { STORE, DONT_TOKENIZE },
+			mimetype = { STORE, INDEX_AS_MIMETYPE },
 			md5 = { STORE, DONT_TOKENIZE },
 			original_filename = { STORE, DONT_TOKENIZE }
 		}
@@ -1023,7 +1024,7 @@ ca_object_representations = {
 			idno = { STORE, DONT_TOKENIZE, INDEX_AS_IDNO, BOOST = 100 },
 			type_id = { STORE, DONT_TOKENIZE },
 			_metadata = { },
-			mimetype = { STORE, DONT_TOKENIZE },
+			mimetype = { STORE, INDEX_AS_MIMETYPE },
 			access = { STORE, DONT_TOKENIZE },
 			status = { STORE, DONT_TOKENIZE },
 			md5 = { STORE, DONT_TOKENIZE },

app/lib/ca/BaseAdvancedSearchController.php

@@ -7,7 +7,7 @@
  * ----------------------------------------------------------------------
  *
  * Software by Whirl-i-Gig (http://www.whirl-i-gig.com)
- * Copyright 2010-2016 Whirl-i-Gig
+ * Copyright 2010-2017 Whirl-i-Gig
  *
  * For more information visit http://www.CollectiveAccess.org
  *
@@ -137,7 +137,8 @@ public function Index($pa_options=null) {
 				'appendToSearch' => $vs_append_to_search,
 				'getCountsByField' => 'type_id',
 				'checkAccess' => $va_access_values,
-				'no_cache' => $vb_is_new_search
+				'no_cache' => $vb_is_new_search,
+				'rootRecordsOnly' => $this->view->getVar('hide_children')
 			);
 
 			if ($vb_is_new_search ||isset($pa_options['saved_search']) || (is_subclass_of($po_search, "BrowseEngine") && !$po_search->numCriteria()) ) {

app/lib/ca/BaseBrowseController.php

@@ -191,7 +191,7 @@ public function Index($pa_options=null) {
 			if ($vs_facet_group = $this->request->config->get($this->ops_tablename.(($this->opo_browse->numCriteria() < 1) ? '_browse_facet_group' : '_browse_refine_facet_group'))) {
 				$this->opo_browse->setFacetGroup($vs_facet_group);
 			}
- 			$this->opo_browse->execute(array('checkAccess' => $va_access_values, 'no_cache' => !$this->opo_result_context->cacheIsValid()));
+ 			$this->opo_browse->execute(array('checkAccess' => $va_access_values, 'no_cache' => !$this->opo_result_context->cacheIsValid(), 'rootRecordsOnly' => $this->view->getVar('hide_children')));
  			$this->opo_result_context->validateCache();
 
 			$this->opo_result_context->setSearchExpression($this->opo_browse->getBrowseID());

app/lib/ca/BaseFindController.php

@@ -257,6 +257,23 @@ public function Index($pa_options=null) {
 
 			$this->view->setVar('result_context', $this->opo_result_context);
 			$this->view->setVar('access_restrictions',AccessRestrictions::load());
+			
+			#
+			#
+			#				
+			$this->view->setVar('children_display_mode_default', ($vs_children_display_mode_default = $this->request->config->get($this->ops_tablename."_children_display_mode_in_results")) ? $vs_children_display_mode_default : "alwaysShow");
+
+			$ps_children_display_mode = $this->opo_result_context->getCurrentChildrenDisplayMode();
+			
+			// force mode when "always" is set
+			if (strtolower($vs_children_display_mode_default) == 'alwaysshow') {
+				$ps_children_display_mode = 'show';
+			} elseif(strtolower($vs_children_display_mode_default) == 'alwayshide') {
+				$ps_children_display_mode = 'hide';
+			}
+			$this->view->setVar('children_display_mode', $ps_children_display_mode);				
+			$this->view->setVar('hide_children', $pb_hide_children = in_array(strtolower($ps_children_display_mode), ['hide', 'alwayshide']));			
+			$this->view->setVar('show_children_display_mode_control', !in_array(strtolower($vs_children_display_mode_default), ['alwaysshow', 'alwayshide']));
  		}
  		# -------------------------------------------------------
 		/**

app/lib/ca/BaseQuickAddController.php

@@ -79,6 +79,9 @@ public function Form($pa_values=null, $pa_options=null) {
  				$this->opo_result_context->setParameter($t_subject->tableName().'_last_parent_id', $vn_parent_id);
  			}
 
+ 			// Get user query
+			$this->view->setVar('q', preg_replace("!^[^:]*:!", "", $this->request->getParameter('q', pString)));
+ 			
  			//
  			// Is record of correct type?
  			// 
@@ -108,6 +111,28 @@ public function Form($pa_values=null, $pa_options=null) {
 					return;
 				}
 			}
+			
+			
+			if (is_array($va_prepopulate_quickadd_fields = explode(";", $this->request->getParameter('prepopulate_fields', pString)))) {
+				$va_prepopulate_quickadd_fields = array_filter($va_prepopulate_quickadd_fields, function($v) { return strlen($v); });
+				foreach($va_prepopulate_quickadd_fields as $vs_field) {
+					if ($t_subject->hasField($vs_field)) { $t_subject->set($vs_field, caUcFirstUTF8Safe($this->view->getVar('q'))); }
+				}
+			}
+			
+			if (!is_array($va_prepopulate_quickadd_fields) || !sizeof($va_prepopulate_quickadd_fields) || in_array('preferred_labels', $va_prepopulate_quickadd_fields)) {		
+				global $g_ui_locale_id;
+				$va_force_new_label = [
+					'locale_id' => $g_ui_locale_id, 									// use default locale
+					$t_subject->getLabelDisplayField() => caUcFirstUTF8Safe($this->view->getVar('q'))		// query text is used for display field
+				];
+				foreach($t_subject->getLabelUIFields() as $vn_i => $vs_fld) {
+					if ($vs_fld === $t_subject->getLabelDisplayField()) { continue; }
+					$va_force_new_label[$vs_fld] = '';
+				}						
+				$this->view->setVar('forceLabel', $va_force_new_label);
+			}
+			
 
  			if(is_array($pa_values)) {
  				foreach($pa_values as $vs_key => $vs_val) {
@@ -211,7 +236,6 @@ public function Form($pa_values=null, $pa_options=null) {
 			$this->view->setVar('fieldNamePrefix', $_REQUEST['_formName']);
 			$this->view->setVar('n', $vs_n);
 
-			$this->view->setVar('q', preg_replace("!^[^:]*:!", "", $this->request->getParameter('q', pString)));
 
 			$this->view->setVar('default_parent_id', $this->opo_result_context->getParameter($t_subject->tableName().'_last_parent_id'));
 

app/lib/ca/BaseSearchController.php

@@ -7,7 +7,7 @@
  * ----------------------------------------------------------------------
  *
  * Software by Whirl-i-Gig (http://www.whirl-i-gig.com)
- * Copyright 2009-2014 Whirl-i-Gig
+ * Copyright 2009-2017 Whirl-i-Gig
  *
  * For more information visit http://www.CollectiveAccess.org
  *
@@ -168,9 +168,11 @@ public function Index($pa_options=null) {
 					'checkAccess' => $va_access_values,
 					'no_cache' => $vb_is_new_search,
 					'dontCheckFacetAvailability' => true,
-					'filterNonPrimaryRepresentations' => true
+					'filterNonPrimaryRepresentations' => true,
+					'rootRecordsOnly' => $this->view->getVar('hide_children')
 				);
 
+				
 				if ($vb_is_new_search ||isset($pa_options['saved_search']) || (is_subclass_of($po_search, "BrowseEngine") && !$po_search->numCriteria()) ) {
 					$vs_browse_classname = get_class($po_search);
  					$po_search = new $vs_browse_classname;

app/lib/ca/Browse/BrowseEngine.php

@@ -971,6 +971,7 @@ public function getInfoForFacetsWithContent() {
 		 *		limitToModifiedOn = if set returned results will be limited to rows modified within the specified date range. The value should be a date/time expression parse-able by TimeExpressionParser
 		 *		user_id = If set item level access control is performed relative to specified user_id, otherwise defaults to logged in user
 		 *		expandResultsHierarchically = expand result set items that are hierarchy roots to include their entire hierarchy. [Default is false]
+		 *		rootRecordsOnly = only return records that are the root of whatever hierarchy they are in. [Default is false]
 		 *
 		 * @return bool True on success, null if the browse could not be executed (Eg. no settings), false no error
 		 */
@@ -1731,6 +1732,8 @@ public function execute($pa_options=null) {
 											$t_loc = new ca_storage_locations();
 
 											if (!is_array($va_loc_ids = $t_loc->getHierarchy($va_row_tmp[2], ['returnAsArray' => true, 'includeSelf' => true, 'idsOnly' => true])) || !sizeof($va_loc_ids)) { continue; }
+											
+											array_pop($va_row_tmp);
 											$va_row_tmp[] = array_values($va_loc_ids);
 
 											$vs_sql = "
@@ -2058,6 +2061,10 @@ public function execute($pa_options=null) {
 						if ((!isset($pa_options['showDeleted']) || !$pa_options['showDeleted']) && $t_item->hasField('deleted')) {
 							$va_wheres[] = "(".$this->ops_browse_table_name.".deleted = 0)";
 						}
+						
+						if ((isset($pa_options['rootRecordsOnly']) && $pa_options['rootRecordsOnly']) && $t_item->hasField('parent_id')) {
+							$va_wheres[] = "(".$this->ops_browse_table_name.".parent_id IS NULL)";
+						}
 
 						if ((isset($pa_options['limitToModifiedOn']) && $pa_options['limitToModifiedOn'])) {
 							$o_tep = new TimeExpressionParser();
@@ -2130,6 +2137,9 @@ public function execute($pa_options=null) {
 					if ((!isset($pa_options['showDeleted']) || !$pa_options['showDeleted']) && $t_item->hasField('deleted')) {
 						$va_wheres[] = "(".$this->ops_browse_table_name.".deleted = 0)";
 					}
+					if ((isset($pa_options['rootRecordsOnly']) && $pa_options['rootRecordsOnly']) && $t_item->hasField('parent_id')) {
+						$va_wheres[] = "(".$this->ops_browse_table_name.".parent_id IS NULL)";
+					}
 
 					if ((isset($pa_options['limitToModifiedOn']) && $pa_options['limitToModifiedOn'])) {
 						$o_tep = new TimeExpressionParser();

app/lib/ca/BundlableLabelableBaseModelWithAttributes.php

@@ -1712,15 +1712,14 @@ public function getBundleFormHTML($ps_bundle_name, $ps_placement_code, $pa_bundl
 					case 'hierarchy_navigation':
 						if ($vb_batch) { return null; } // not supported in batch mode
 						if ($this->isHierarchical()) {
-							$vs_element .= $this->getHierarchyNavigationHTMLFormBundle($pa_options['request'], $pa_options['formName'], $ps_placement_code, array(), $pa_bundle_settings, $pa_options);
+							$vs_element .= $this->getHierarchyNavigationHTMLFormBundle($pa_options['request'], $pa_options['formName'], $ps_placement_code, $pa_options, $pa_bundle_settings);
 						}
 						break;
 					# -------------------------------
 					// Hierarchical item location control
 					case 'hierarchy_location':
-						if ($vb_batch) { return null; } // not supported in batch mode
 						if ($this->isHierarchical()) {
-							$vs_element .= $this->getHierarchyLocationHTMLFormBundle($pa_options['request'], $pa_options['formName'], $ps_placement_code, array(), $pa_bundle_settings, $pa_options);
+							$vs_element .= $this->getHierarchyLocationHTMLFormBundle($pa_options['request'], $pa_options['formName'], $ps_placement_code, $pa_options, $pa_bundle_settings);
 						}
 						break;
 					# -------------------------------
@@ -2611,6 +2610,8 @@ private function _getHierarchyLocationHTMLFormBundleInfo($po_request, $ps_form_n
 		$vs_view_path = (isset($pa_options['viewPath']) && $pa_options['viewPath']) ? $pa_options['viewPath'] : $po_request->getViewsDirectoryPath();
 		$o_view = new View($po_request, "{$vs_view_path}/bundles/");
 
+		$pb_batch = caGetOption('batch', $pa_options, false);
+		
 		if(!is_array($pa_bundle_settings)) { $pa_bundle_settings = array(); }
 
 		if (!($vs_label_table_name = $this->getLabelTableName())) { return ''; }
@@ -2747,10 +2748,18 @@ private function _getHierarchyLocationHTMLFormBundleInfo($po_request, $ps_form_n
 			}
 		}
 
+		$vn_first_id = null;
+		if ($pb_batch && ($pn_set_id = caGetOption('set_id', $pa_options, null))) { 
+			$t_set = new ca_sets($pn_set_id); 
+			if (is_array($va_ids = $t_set->getItemRowIDs()) && sizeof($va_ids)) {
+				$vn_first_id = array_shift($va_ids);
+			}
+		}
 
+		$o_view->setVar('batch', $pb_batch);
 		$o_view->setVar('parent_id', $vn_parent_id);
 		$o_view->setVar('ancestors', $va_ancestor_list);
-		$o_view->setVar('id', $this->getPrimaryKey());
+		$o_view->setVar('id', $pb_batch && $vn_first_id ? $vn_first_id : $this->getPrimaryKey());
 		$o_view->setVar('settings', $pa_bundle_settings);
 
 		return $o_view;
@@ -2917,6 +2926,8 @@ public function getRelatedHTMLFormBundle($po_request, $ps_form_name, $ps_related
 		if (!$pa_bundle_settings['readonly']) { $pa_bundle_settings['readonly'] = (!isset($pa_bundle_settings['readonly']) || !$pa_bundle_settings['readonly']) ? $vb_read_only : true;	}
 
 		// pass bundle settings
+		
+		if(!is_array($pa_bundle_settings['prepopulateQuickaddFields'])) { $pa_bundle_settings['prepopulateQuickaddFields'] = []; }
 		$o_view->setVar('settings', $pa_bundle_settings);
 		$o_view->setVar('graphicsPath', $pa_options['graphicsPath']);
 
@@ -3006,6 +3017,7 @@ public function getRelatedListHTMLFormBundle($po_request, $ps_bundle_name, $ps_f
 		$vb_read_only = ($po_request->user->getBundleAccessLevel($this->tableName(), $ps_bundle_name) == __CA_BUNDLE_ACCESS_READONLY__) ? true : false;
 		if (!$pa_bundle_settings['readonly']) { $pa_bundle_settings['readonly'] = (!isset($pa_bundle_settings['readonly']) || !$pa_bundle_settings['readonly']) ? $vb_read_only : true;	}
 
+		if(!is_array($pa_bundle_settings['prepopulateQuickaddFields'])) { $pa_bundle_settings['prepopulateQuickaddFields'] = []; }
 		$o_view->setVar('settings', $pa_bundle_settings);
 		$o_view->setVar('placement_code', $ps_placement_code);
 		$o_view->setVar('add_label', caExtractSettingValueByLocale($pa_bundle_settings, 'add_label', $g_ui_locale));
@@ -3518,11 +3530,12 @@ public function saveBundlesForScreen($pm_screen, $po_request, &$pa_options) {
 		}
 }
 
-if (!$vb_batch) {		// hierarchy moves are not supported in batch mode
 	if (is_array($va_fields_by_type['special'])) {
 		foreach($va_fields_by_type['special'] as $vs_placement_code => $vs_bundle) {
 			if ($vs_bundle !== 'hierarchy_location') { continue; }
 
+			if ($po_request->getParameter($vs_placement_code.$vs_form_prefix.'_batch_mode', pString) !== '_replace_') { continue; }
+			
 			$va_parent_tmp = explode("-", $po_request->getParameter("{$vs_placement_code}{$vs_form_prefix}_new_parent_id", pString));
 
 			// Hierarchy browser sets new_parent_id param to "X" if user wants to extract item from hierarchy
@@ -3558,7 +3571,6 @@ public function saveBundlesForScreen($pm_screen, $po_request, &$pa_options) {
 			break;
 		}
 	}
-}
 
 		//
 		// Call processBundlesBeforeBaseModelSave() method in sub-class, if it is defined. The method is passed