Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: benhosmer/ideation
base: 27f0774eb9
...
head fork: benhosmer/ideation
compare: d747df38e5
Checking mergeability… Don't worry, you can still create the pull request.
  • 1 commit
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 44 additions and 96 deletions.
  1. +39 −96 ideation.features.content.inc
  2. +5 −0 ideation.module
View
135 ideation.features.content.inc
@@ -6,73 +6,6 @@
function ideation_content_default_fields() {
$fields = array();
- // Exported field: field_idea_categories
- $fields['idea_group-field_idea_categories'] = array(
- 'field_name' => 'field_idea_categories',
- 'type_name' => 'idea_group',
- 'display_settings' => array(
- 'weight' => '-2',
- 'parent' => '',
- 'label' => array(
- 'format' => 'hidden',
- ),
- 'teaser' => array(
- 'format' => 'linked',
- 'exclude' => 0,
- ),
- 'full' => array(
- 'format' => 'linked',
- 'exclude' => 0,
- ),
- '5' => array(
- 'format' => 'default',
- 'exclude' => 0,
- ),
- '4' => array(
- 'format' => 'default',
- 'exclude' => 0,
- ),
- '2' => array(
- 'format' => 'default',
- 'exclude' => 0,
- ),
- '3' => array(
- 'format' => 'default',
- 'exclude' => 0,
- ),
- 'token' => array(
- 'format' => 'default',
- 'exclude' => 0,
- ),
- ),
- 'widget_active' => '1',
- 'type' => 'text',
- 'required' => '0',
- 'multiple' => '1',
- 'module' => 'text',
- 'active' => '1',
- 'text_processing' => '0',
- 'max_length' => '',
- 'allowed_values' => 'Mathematics
-English
-Science
-Literature Arts',
- 'allowed_values_php' => '',
- 'widget' => array(
- 'default_value' => array(
- '0' => array(
- 'value' => '',
- ),
- ),
- 'default_value_php' => NULL,
- 'label' => 'Categories',
- 'weight' => '-1',
- 'description' => '',
- 'type' => 'optionwidgets_select',
- 'module' => 'optionwidgets',
- ),
- );
-
// Exported field: field_idea_status
$fields['idea_group-field_idea_status'] = array(
'field_name' => 'field_idea_status',
@@ -120,11 +53,11 @@ Literature Arts',
'active' => '1',
'text_processing' => '0',
'max_length' => '',
- 'allowed_values' => 'No Status
-Under Review
-In Action
-Current Activity
-Unable to Implement
+ 'allowed_values' => 'No Status
+Under Review
+In Action
+Current Activity
+Unable to Implement
Myth Buster',
'allowed_values_php' => '',
'widget' => array(
@@ -189,7 +122,7 @@ Myth Buster',
'active' => '1',
'text_processing' => '0',
'max_length' => '',
- 'allowed_values' => 'Off|Off
+ 'allowed_values' => 'Off|Off
Idea We\'re Watching|Idea We\'re Watching',
'allowed_values_php' => '',
'widget' => array(
@@ -247,30 +180,40 @@ Idea We\'re Watching|Idea We\'re Watching',
),
),
'widget_active' => '1',
- 'type' => 'text',
- 'required' => '0',
- 'multiple' => '1',
- 'module' => 'text',
+ 'type' => 'nodereference',
+ 'required' => '1',
+ 'multiple' => '0',
+ 'module' => 'nodereference',
'active' => '1',
- 'text_processing' => '0',
- 'max_length' => '',
- 'allowed_values' => 'Mathematics
-English
-Science
-Literature Arts',
- 'allowed_values_php' => '',
+ 'referenceable_types' => array(
+ 'casetracker_basic_project' => 'casetracker_basic_project',
+ 'blog' => 0,
+ 'book' => 0,
+ 'casetracker_basic_case' => 0,
+ 'event' => 0,
+ 'group' => 0,
+ 'profile' => 0,
+ 'shoutbox' => 0,
+ 'feed_ical_item' => 0,
+ 'feed_ical' => 0,
+ 'project_discussion' => 0,
+ ),
+ 'advanced_view' => 'casetracker_projects',
+ 'advanced_view_args' => '',
'widget' => array(
+ 'autocomplete_match' => 'contains',
+ 'size' => 60,
'default_value' => array(
'0' => array(
- 'value' => '',
+ 'nid' => '',
),
),
'default_value_php' => NULL,
- 'label' => 'Categories',
- 'weight' => '-1',
- 'description' => '',
- 'type' => 'optionwidgets_select',
- 'module' => 'optionwidgets',
+ 'label' => 'Project',
+ 'weight' => '-2',
+ 'description' => 'Choose the project that this idea relates to.',
+ 'type' => 'nodereference_select',
+ 'module' => 'nodereference',
),
);
@@ -321,11 +264,11 @@ Literature Arts',
'active' => '1',
'text_processing' => '0',
'max_length' => '',
- 'allowed_values' => 'No Status
-Under Review
-In Action
-Current Activity
-Unable to Implement
+ 'allowed_values' => 'No Status
+Under Review
+In Action
+Current Activity
+Unable to Implement
Myth Buster',
'allowed_values_php' => '',
'widget' => array(
@@ -390,7 +333,7 @@ Myth Buster',
'active' => '1',
'text_processing' => '0',
'max_length' => '',
- 'allowed_values' => 'Off|Off
+ 'allowed_values' => 'Off|Off
Idea We\'re Watching|Idea We\'re Watching',
'allowed_values_php' => '',
'widget' => array(
View
5 ideation.module
@@ -43,6 +43,11 @@ function ideation_idea_group_access_callback() {
}
else {
// Otherwise, deny access.
+ if(module_exists('og')) { //BUG FIX Addition
+ if (og_get_group_context()) { //Bug Fix Addition
+ return TRUE; // Bug Fix Addition
+ } // Bug Fix Addition
+ } // Bug Fix Addition
return FALSE;
}
}

No commit comments for this range

Something went wrong with that request. Please try again.