Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

two errors while vagrant up on islandora-playbook repository #1

Open
wants to merge 109 commits into
base: 7.x
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
56c2afc
Add orphaned objects capability to core
Dec 6, 2017
2e17b7d
Add Islandora to various descriptions and titles
Dec 12, 2017
962782c
Simplify and make a single query
Jan 17, 2018
4dba1b2
ISLANDORA-2153: Allow datastreams with no MIME type restrictions to b…
DiegoPino Feb 3, 2018
bb19d99
Amend SPARQL query to exclude objects with any living parent.
Feb 26, 2018
3a25a1f
Make permissions work
Feb 26, 2018
5894477
XACML OK
Feb 26, 2018
92a9096
Permissions
Feb 26, 2018
ecca265
Change query to SELECT DISTINCT, remove ?p ?otherobject
Feb 26, 2018
bc2918c
Function names and delete path
Feb 27, 2018
7b5a601
Show list of objects to confirmation page
Feb 27, 2018
34ff60a
Add warning to report page
Feb 27, 2018
31a5e87
Rename functions and define permissions constant
Feb 27, 2018
5ecc9aa
Remove quotes from permissions
Feb 27, 2018
f62b91e
Coding standards
Feb 27, 2018
898c553
Coding standards, and remove unneeded variable.
Feb 27, 2018
d443a7c
Turn list of pids_to_delete into an array, and correct warning text
Mar 5, 2018
3c2cc26
Remove unnecessary code
Mar 5, 2018
f299fb7
Remove quotes from access arguments
Mar 7, 2018
1f22788
ISLANDORA-2073 Don't allow datastreams if object is forbidden. (#698)
rosiel Mar 7, 2018
124b399
Ensure object/ds are accessible before verifying token. (#701)
jordandukart Mar 8, 2018
deca176
Fix pid undefined constant
Mar 12, 2018
9eb5a0a
Removing jenkins and doxygen stuff (#700)
dannylamb Mar 16, 2018
62048f5
Update module maintainer in README, use HTTPS for GitHub (#702)
bencomp Mar 19, 2018
482c9e6
Add error message for delete failure
Mar 20, 2018
61d1ea3
Merge pull request #699 from mnylc/7.x-ISLANDORA-2153
mjordan Mar 21, 2018
b8c21bd
Merge pull request #697 from bondjimbond/orphans
mjordan Mar 22, 2018
dfaa6ed
Respect namespace restrictions in manage deleted objects.
whikloj Mar 23, 2018
51b01c5
Merge pull request #703 from whikloj/7.x-ISLANDORA-2178
bondjimbond Mar 28, 2018
42fa70c
Prevent Warning
jonathangreen Apr 11, 2018
7d9cdc2
Code review feedback
jonathangreen Apr 13, 2018
558cb6d
Merge pull request #704 from jonathangreen/warning
DiegoPino Apr 23, 2018
d05707f
Documentation of new permission and add screenshot to README.
rosiel May 21, 2018
3144ada
Update README.md for style.
rosiel May 27, 2018
d8b8b4f
ISLANDORA-1748 -- add hook_islandora_datastream_filename_alter(). (#706)
patdunlavey May 27, 2018
1c7e041
Merge pull request #707 from rosiel/7.x-documentation
DiegoPino Jun 12, 2018
7f3d781
made logging messages more accurate (#709)
ajstanley Sep 6, 2018
6ada7c4
Adds Jon Green to README maintainer list
bryjbrown Oct 2, 2018
e576c33
Merge pull request #711 from bryjbrown/7.x-1.12-audit
DiegoPino Oct 2, 2018
f3b3ffc
Allow orphaned object report to find orphaned compound objects. (#710)
jonathangreen Oct 9, 2018
7a319ce
Update PULL_REQUEST_TEMPLATE.md
manez Nov 29, 2018
2519954
Update PULL_REQUEST_TEMPLATE.md
manez Nov 29, 2018
d6679cb
Form_load_include the file.
jordandukart Dec 17, 2018
86a6d0a
Merge pull request #713 from jordandukart/7.x-ISLANDORA-2359
DiegoPino Dec 19, 2018
f457a4a
Merge pull request #712 from manez/7.x
bondjimbond Jan 10, 2019
a46936c
Install drush with composer (#714)
whikloj Feb 12, 2019
e3bf90e
fix test runner and document travis scripts (#715)
whikloj Feb 12, 2019
5642dbe
Allow custom codesniffer ignore arguments (#716)
whikloj Feb 22, 2019
bcfe5c2
Type as bool.
jordandukart Feb 27, 2019
3b04eed
Merge pull request #717 from jordandukart/7.x
whikloj Feb 28, 2019
cdc8ccf
Typing.
jordandukart Mar 29, 2019
2be8d5a
Merge pull request #718 from jordandukart/7.x
whikloj Apr 1, 2019
1ef7ca3
Allow PHP 5.3.3 to fail
whikloj May 3, 2019
525283c
Coder
whikloj May 3, 2019
dd77f60
Remove extra newline
whikloj May 3, 2019
df66c5a
Add mods to dc transform
May 6, 2019
07f7b34
Document hook for Travis
May 16, 2019
e1d8b77
Fix travis tuque warning
May 21, 2019
13d87d4
Another attempt to fix travis
May 21, 2019
147dc73
Last try at travis
May 21, 2019
acac16d
one more try with travis
May 22, 2019
5c32aee
Try again with Travis
May 22, 2019
daffe53
Final fix for Travis
May 22, 2019
ab0734e
Dumb paste errors
May 22, 2019
86719d1
TRAVIS
May 22, 2019
e165da1
Sigh travis
May 22, 2019
da2203f
Travis is very picky
May 23, 2019
d01c5a0
See if Travis likes this
May 23, 2019
80481e6
Tell dcs to ignore deprecation message
May 24, 2019
e15544f
Merge pull request #720 from whikloj/7.x-ISLANDORA-2424
DiegoPino May 24, 2019
d48b756
get rid of deprecation stuff
May 27, 2019
aa527e4
Merge branch '7.x' of https://github.com/Islandora/islandora into cen…
May 27, 2019
a7bf4da
Merge pull request #721 from bondjimbond/centralize_dc
DiegoPino May 28, 2019
84be1af
Add datastream paths to list of admin paths
Jun 12, 2019
bfb57b2
ISLANDORA-2444 Update readme with Awesome link
manez Jun 13, 2019
45c4410
Explicitly list version paths to make admin paths
Jun 19, 2019
eb2c412
Merge pull request #724 from manez/7.x
bondjimbond Jun 20, 2019
f5ff5a1
Merge pull request #723 from mghughes/7.x-datastream-admin-paths
DiegoPino Jul 16, 2019
90414e5
Stop running "style" coder check (#722)
whikloj Jul 16, 2019
a36b648
Fix islandora for latest 3.6 coding standard update.
jonathangreen Oct 3, 2019
3a94b6a
Merge pull request #728 from jonathangreen/fix_codesniffer
whikloj Oct 10, 2019
6f58ace
Dummy composer.json to see if it'll appease packagist
dannylamb Oct 17, 2019
02b7b2b
Merge pull request #734 from dannylamb/7-x-packagist
whikloj Oct 17, 2019
08d0fd7
Revert "Dummy composer.json to see if it'll appease packagist"
whikloj Oct 18, 2019
0044efd
Add optional label text to datastream download links
dheles Oct 22, 2019
8a2a354
Merge pull request #738 from Islandora/revert-734-7-x-packagist
DiegoPino Oct 23, 2019
52010c8
Merge pull request #727 from dheles/7.x-ISLANDORA-2480
DiegoPino Oct 24, 2019
5e88176
Fix theme_islandora_datastream_view_link() (#726)
dheles Nov 1, 2019
064b115
Add Solr option for Orphaned Objects list
Nov 2, 2020
2f3a886
Clean up comments
Nov 2, 2020
06163b7
Make sure each parent object is loaded only once
Nov 4, 2020
9403d3b
Style cleanup
Nov 4, 2020
ea2bc27
Remove debug
Nov 23, 2020
061ead2
Convert islandora_object_load to a solr query
Nov 23, 2020
4277530
Fix the php error
Nov 23, 2020
a3cb1ba
Merge pull request #1 from bondjimbond/solr_pid
bondjimbond Nov 23, 2020
404221a
review from bryjbrown
Nov 24, 2020
29f88b8
Merge pull request #2 from bondjimbond/solr_pid
bondjimbond Nov 24, 2020
155b2bd
Add new variable to install file
Nov 24, 2020
e7d0030
Merge pull request #3 from bondjimbond/solr_pid
bondjimbond Nov 24, 2020
a7ebc54
Fix travis and failing file
Nov 25, 2020
e2fdb9e
Travis
Nov 25, 2020
dc12d52
foreach fix
Nov 25, 2020
430b500
Merge pull request #807 from bondjimbond/7.x
bryjbrown Nov 30, 2020
64334d2
Exclude configured root from orphans list
Nov 30, 2020
f36f2da
Exclude root collection from orphans list
Nov 30, 2020
cb1e47e
More efficient IFs
Dec 1, 2020
4258cfa
Travis
Dec 1, 2020
c34c7ac
Merge pull request #813 from bondjimbond/parent_fix
bryjbrown Dec 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename functions and define permissions constant
  • Loading branch information
Brandon Weigel committed Feb 27, 2018
commit 31a5e877389f5c921fce6d1c1ef7d933738dc3f1
28 changes: 14 additions & 14 deletions includes/orphaned_objects.inc
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
* @return array
* An array containing the form to be rendered.
*/
function islandora_orphaned_objects_manage_form($form, $form_state) {
function islandora_manage_orphaned_objects_form($form, $form_state) {
if (isset($form_state['show_confirm'])) {
$pids = $form_state['pids_to_delete'];
if (count($form_state['pids_to_delete']) == 1) {
@@ -40,7 +40,7 @@ function islandora_orphaned_objects_manage_form($form, $form_state) {
'#type' => 'submit',
'#value' => t('Confirm'),
'#weight' => 2,
'#submit' => array('islandora_orphaned_objects_manage_confirm_submit'),
'#submit' => array('islandora_manage_orphaned_objects_confirm_submit'),
);
$form['cancel_submit'] = array(
'#type' => 'submit',
@@ -71,14 +71,14 @@ function islandora_orphaned_objects_manage_form($form, $form_state) {
$form['submit_selected'] = array(
'#type' => 'submit',
'#name' => 'islandora-orphaned-objects-submit-selected',
'#validate' => array('islandora_orphaned_objects_manage_delete_selected_validate'),
'#submit' => array('islandora_orphaned_objects_manage_delete_submit'),
'#validate' => array('islandora_delete_selected_orphaned_objects_validate'),
'#submit' => array('islandora_delete_orphaned_objects_submit'),
'#value' => t('Delete Selected'),
);
$form['submit_all'] = array(
'#type' => 'submit',
'#name' => 'islandora-orphaned-objects-submit-all',
'#submit' => array('islandora_orphaned_objects_manage_delete_submit'),
'#submit' => array('islandora_delete_orphaned_objects_submit'),
'#value' => t('Delete All'),
);
}
@@ -93,7 +93,7 @@ function islandora_orphaned_objects_manage_form($form, $form_state) {
* @param array $form_state
* An array containing the Drupal form state.
*/
function islandora_orphaned_objects_manage_delete_selected_validate($form, $form_state) {
function islandora_delete_selected_orphaned_objects_validate($form, $form_state) {
$selected = array_filter($form_state['values']['management_table']);
if (empty($selected)) {
form_error($form['management_table'], t('At least one object must be selected to delete!'));
@@ -107,7 +107,7 @@ function islandora_orphaned_objects_manage_delete_selected_validate($form, $form
* @param array $form_state
* An array containing the Drupal form state.
*/
function islandora_orphaned_objects_manage_delete_submit(&$form, &$form_state) {
function islandora_delete_orphaned_objects_submit(&$form, &$form_state) {
if ($form_state['triggering_element']['#name'] == 'islandora-orphaned-objects-submit-selected') {
$selected = array_keys(array_filter($form_state['values']['management_table']));
}
@@ -127,8 +127,8 @@ function islandora_orphaned_objects_manage_delete_submit(&$form, &$form_state) {
* @param array $form_state
* An array containing the Drupal form state.
*/
function islandora_orphaned_objects_manage_confirm_submit($form, &$form_state) {
$batch = islandora_orphaned_objects_delete_create_batch($form_state['pids_to_delete']);
function islandora_manage_orphaned_objects_confirm_submit($form, &$form_state) {
$batch = islandora_delete_orphaned_objects_create_batch($form_state['pids_to_delete']);
batch_set($batch);
}

@@ -199,17 +199,17 @@ EOQ;
* @return array
* An array detailing the batch that is about to be run.
*/
function islandora_orphaned_objects_delete_create_batch($pids) {
function islandora_delete_orphaned_objects_create_batch($pids) {
// Set up a batch operation.
$batch = array(
'operations' => array(
array('islandora_orphaned_objects_delete_batch_operation', array($pids)),
array('islandora_delete_orphaned_objects_batch_operation', array($pids)),
),
'title' => t('Deleting the selected objects...'),
'init_message' => t('Preparing to delete objects.'),
'progress_message' => t('Time elapsed: @elapsed <br/>Estimated time remaining @estimate.'),
'error_message' => t('An error has occurred.'),
'finished' => 'islandora_orphaned_objects_delete_batch_finished',
'finished' => 'islandora_delete_orphaned_objects_batch_finished',
'file' => drupal_get_path('module', 'islandora') . '/includes/orphaned_objects.inc',
);
return $batch;
@@ -222,7 +222,7 @@ function islandora_orphaned_objects_delete_create_batch($pids) {
* @param array $context
* The context of the Drupal batch.
*/
function islandora_orphaned_objects_delete_batch_operation($pids, &$context) {
function islandora_delete_orphaned_objects_batch_operation($pids, &$context) {
if (empty($context['sandbox'])) {
$context['sandbox'] = array();
$context['sandbox']['progress'] = 0;
@@ -255,7 +255,7 @@ function islandora_orphaned_objects_delete_batch_operation($pids, &$context) {
* @param array $operations
* The operations array that was used in the batch.
*/
function islandora_orphaned_objects_delete_batch_finished($success, $results, $operations) {
function islandora_delete_orphaned_objects_batch_finished($success, $results, $operations) {
if ($success) {
$message = format_plural(count($results['success']), 'One object deleted.', '@count objects deleted.');
}
3 changes: 2 additions & 1 deletion islandora.module
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@ define('ISLANDORA_MANAGE_DELETED_OBJECTS', 'manage deleted objects');
define('ISLANDORA_REVERT_DATASTREAM', 'revert to old datastream');
define('ISLANDORA_REGENERATE_DERIVATIVES', 'regenerate derivatives for an object');
define('ISLANDORA_REPLACE_DATASTREAM_CONTENT', 'replace a datastream with new content, preserving version history');
define('ISLANDORA_MANAGE_ORPHANED_OBJECTS', 'view and delete a list of orphaned objects');

// Hooks.
define('ISLANDORA_VIEW_HOOK', 'islandora_view_object');
@@ -401,7 +402,7 @@ function islandora_menu() {
'title' => 'Orphaned Islandora objects',
'description' => 'List of orphaned Islandora objects.',
'page callback' => 'drupal_get_form',
'page arguments' => array('islandora_orphaned_objects_manage_form'),
'page arguments' => array('islandora_manage_orphaned_objects_form'),
'access arguments' => array('ISLANDORA_MANAGE_ORPHANED_OBJECTS'),
'file' => 'includes/orphaned_objects.inc',
);