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.

Sign up for GitHub

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

P2 rerereview #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

P2 rerereview #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90ea659
Remove obsolete TODO
kasperg Jun 7, 2016
c2530bb
Attempt at simplifying openlist admin form path
kasperg Jun 7, 2016
62ecc42
Fix typo
kasperg Jun 7, 2016
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
1 change: 0 additions & 1 deletion modules/p2/ding_list/include/functions.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,6 @@ function ding_list_add_permission($list, $permission, $account = NULL) {
));

$id = $account->uid;
// TODO I suggest replacing module_exists with ding_provider_implements.
if (ding_provider_implements('openlist', 'user_identifier')) {
$id = ding_provider_invoke('openlist', 'user_identifier', $account);
}
Expand Down
19 changes: 1 addition & 18 deletions modules/p2/ting_openlist/ting_openlist.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ function ting_openlist_ding_provider() {

return array(
'title' => 'Ting Openlist provider',
// Notice we set the file path in hook_menu_alter()
'file' => 'ting_openlist.admin.inc',
'file' => drupal_get_path('module', 'ting_openlist') . '/ting_openlist.admin.inc',
'settings' => 'ting_openlist_settings_form',
'provides' => array(
'openlist' => array(
Expand All @@ -47,22 +46,6 @@ function ting_openlist_ding_provider() {
);
}

/**
* Implements hook_menu_alter().
*
* This fixes the ding_provider menu, without the need to do any changes
* to the core module (although the ding_provider module should get fixed)
*
* TODO Why is this needed? Could we fix this in ding_provider instead?
*
* TODO-REPLY ding_provider needs to implement the file path option in the
* hook_menu. If file path is not supplied it looks for file in
* the ding_provider folder.
*/
function ting_openlist_menu_alter(&$items) {
$items['admin/config/ding/provider/ting_openlist']['file path'] = drupal_get_path('module', 'ting_openlist');
}

/**
* Implements hook_menu().
*/
Expand Down
3 changes: 1 addition & 2 deletions modules/p2/ting_token/ting_token.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ function ting_token_preprocess_page(&$variables) {
drupal_add_library('system', 'drupal.ajax');
drupal_add_library('system', 'drupal.form');
drupal_add_library('system', 'jquery.form');
// TODO Typo?
drupal_add_library('system', 'druapl.progress');
drupal_add_library('system', 'drupal.progress');
drupal_add_library('system', 'drupal.textarea');
drupal_add_js(
array(
Expand Down