diff --git commitlog/includes/views/default_views/commitlog_global_commits.view.php commitlog/includes/views/default_views/commitlog_global_commits.view.php
index cb2cf26..0653969 100644
--- commitlog/includes/views/default_views/commitlog_global_commits.view.php
+++ commitlog/includes/views/default_views/commitlog_global_commits.view.php
@@ -314,6 +314,445 @@ $handler->override_option('style_options', array(
'type' => 'ul',
));
$handler = $view->new_display('feed', 'Feed', 'feed');
+$handler->override_option('fields', array(
+ 'attribution' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'exclude' => 1,
+ 'id' => 'attribution',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'attribution',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'labels' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 1,
+ 'id' => 'labels',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'labels',
+ 'relationship' => 'none',
+ ),
+ 'revision' => array(
+ 'label' => 'Revision',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 0,
+ 'ellipsis' => 0,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'operation_format' => 'short',
+ 'exclude' => 1,
+ 'id' => 'revision',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'revision',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'nothing' => array(
+ 'label' => 'Title',
+ 'alter' => array(
+ 'text' => 'Commit [revision] on [labels] [attribution]',
+ 'make_link' => 0,
+ 'path' => '#',
+ 'link_class' => 'global-author',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 0,
+ 'id' => 'nothing',
+ 'table' => 'views',
+ 'field' => 'nothing',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'repo_id' => array(
+ 'label' => 'Repository ID',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'set_precision' => FALSE,
+ 'precision' => 0,
+ 'decimal' => '.',
+ 'separator' => ',',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'exclude' => 1,
+ 'id' => 'repo_id',
+ 'table' => 'versioncontrol_repositories',
+ 'field' => 'repo_id',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'revision_1' => array(
+ 'label' => 'Full Revision',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'operation_format' => 'full',
+ 'exclude' => 1,
+ 'id' => 'revision_1',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'revision',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'nothing_2' => array(
+ 'label' => 'Individual commit link',
+ 'alter' => array(
+ 'text' => 'commitlog/commit/[repo_id]/[revision_1]',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 0,
+ 'id' => 'nothing_2',
+ 'table' => 'views',
+ 'field' => 'nothing',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'vc_op_id' => array(
+ 'label' => 'Operation ID',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'set_precision' => FALSE,
+ 'precision' => 0,
+ 'decimal' => '.',
+ 'separator' => ',',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'exclude' => 0,
+ 'id' => 'vc_op_id',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'vc_op_id',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'view' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => FALSE,
+ 'text' => '',
+ 'make_link' => FALSE,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => FALSE,
+ 'max_length' => '',
+ 'word_boundary' => TRUE,
+ 'ellipsis' => TRUE,
+ 'html' => FALSE,
+ 'strip_tags' => FALSE,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'view' => 'commitlog_commit_items',
+ 'display' => 'block_2',
+ 'arguments' => '[vc_op_id]',
+ 'query_aggregation' => 1,
+ 'exclude' => 1,
+ 'id' => 'view',
+ 'table' => 'views',
+ 'field' => 'view',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'message' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => 1,
+ 'text' => '[message]
',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'issue_tracker_url' => '',
+ 'exclude' => 1,
+ 'id' => 'message',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'message',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'nothing_1' => array(
+ 'label' => 'Description',
+ 'alter' => array(
+ 'text' => '[view]
+[message]',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 0,
+ 'id' => 'nothing_1',
+ 'table' => 'views',
+ 'field' => 'nothing',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'author' => array(
+ 'label' => 'Author',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'exclude' => 0,
+ 'id' => 'author',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'author',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'date' => array(
+ 'label' => 'Date',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'date_format' => 'custom',
+ 'custom_date_format' => 'r',
+ 'link' => 0,
+ 'exclude' => 0,
+ 'id' => 'date',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'date',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+));
$handler->override_option('style_plugin', 'rss');
$handler->override_option('style_options', array(
'mission_description' => FALSE,
@@ -322,7 +761,11 @@ $handler->override_option('style_options', array(
$handler->override_option('row_plugin', 'versioncontrol_operations_rss');
$handler->override_option('row_options', array(
'relationship' => 'none',
- 'single_operation_view' => 'commitlog_individual_commit',
+ 'title_field' => 'nothing',
+ 'link_field' => 'nothing_2',
+ 'description_field' => 'nothing_1',
+ 'creator_field' => 'author',
+ 'date_field' => 'date',
));
$handler->override_option('path', 'versioncontrol/garbage/path');
$handler->override_option('menu', array(
diff --git commitlog/includes/views/default_views/commitlog_repository_commits.view.php commitlog/includes/views/default_views/commitlog_repository_commits.view.php
index 5d7b498..35307e1 100644
--- commitlog/includes/views/default_views/commitlog_repository_commits.view.php
+++ commitlog/includes/views/default_views/commitlog_repository_commits.view.php
@@ -307,7 +307,7 @@ $handler->override_option('arguments', array(
'style_options' => array(),
'wildcard' => 'all',
'wildcard_substitution' => 'All',
- 'title' => 'Repository %1',
+ 'title' => 'Repository %1 commits',
'breadcrumb' => '',
'default_argument_type' => 'fixed',
'default_argument' => '',
@@ -328,7 +328,6 @@ $handler->override_option('arguments', array(
'default_argument_user' => 0,
'default_argument_php' => '',
'validate_argument_node_type' => array(
- 'project_project' => 0,
'page' => 0,
'story' => 0,
),
@@ -354,6 +353,407 @@ $handler->override_option('cache', array(
$handler->override_option('use_pager', '1');
$handler->override_option('style_plugin', 'list');
$handler = $view->new_display('feed', 'Feed', 'feed');
+$handler->override_option('fields', array(
+ 'attribution' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'exclude' => 1,
+ 'id' => 'attribution',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'attribution',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'labels' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 1,
+ 'id' => 'labels',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'labels',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'revision' => array(
+ 'label' => 'Revision',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 0,
+ 'ellipsis' => 0,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'operation_format' => 'short',
+ 'exclude' => 1,
+ 'id' => 'revision',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'revision',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'nothing' => array(
+ 'label' => 'Title',
+ 'alter' => array(
+ 'text' => 'Commit [revision] on [labels] [attribution]',
+ 'make_link' => 0,
+ 'path' => '#',
+ 'link_class' => 'global-author',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 0,
+ 'id' => 'nothing',
+ 'table' => 'views',
+ 'field' => 'nothing',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'revision_1' => array(
+ 'label' => 'Full Revision',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'operation_format' => 'full',
+ 'exclude' => 1,
+ 'id' => 'revision_1',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'revision',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'nothing_2' => array(
+ 'label' => 'Individual commit link',
+ 'alter' => array(
+ 'text' => 'commitlog/commit/!1/[revision_1]',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 0,
+ 'id' => 'nothing_2',
+ 'table' => 'views',
+ 'field' => 'nothing',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'vc_op_id' => array(
+ 'label' => 'Operation ID',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'strip_tags' => 0,
+ 'html' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'set_precision' => FALSE,
+ 'precision' => 0,
+ 'decimal' => '.',
+ 'separator' => ',',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'exclude' => 1,
+ 'id' => 'vc_op_id',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'vc_op_id',
+ 'relationship' => 'none',
+ ),
+ 'view' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => FALSE,
+ 'text' => '',
+ 'make_link' => FALSE,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => FALSE,
+ 'max_length' => '',
+ 'word_boundary' => TRUE,
+ 'ellipsis' => TRUE,
+ 'html' => FALSE,
+ 'strip_tags' => FALSE,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'view' => 'commitlog_commit_items',
+ 'display' => 'block_2',
+ 'arguments' => '[vc_op_id]',
+ 'query_aggregation' => 1,
+ 'exclude' => 1,
+ 'id' => 'view',
+ 'table' => 'views',
+ 'field' => 'view',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'message' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => 1,
+ 'text' => '[message]
',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'issue_tracker_url' => '',
+ 'exclude' => 1,
+ 'id' => 'message',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'message',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'nothing_1' => array(
+ 'label' => 'Description',
+ 'alter' => array(
+ 'text' => '[view]
+[message]',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 0,
+ 'id' => 'nothing_1',
+ 'table' => 'views',
+ 'field' => 'nothing',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'author' => array(
+ 'label' => 'Author',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'exclude' => 0,
+ 'id' => 'author',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'author',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'date' => array(
+ 'label' => 'Date',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'date_format' => 'custom',
+ 'custom_date_format' => 'r',
+ 'link' => 0,
+ 'exclude' => 0,
+ 'id' => 'date',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'date',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+));
$handler->override_option('style_plugin', 'rss');
$handler->override_option('style_options', array(
'mission_description' => FALSE,
@@ -362,7 +762,11 @@ $handler->override_option('style_options', array(
$handler->override_option('row_plugin', 'versioncontrol_operations_rss');
$handler->override_option('row_options', array(
'relationship' => 'none',
- 'single_operation_view' => 'commitlog_individual_commit',
+ 'title_field' => 'nothing',
+ 'link_field' => 'nothing_2',
+ 'description_field' => 'nothing_1',
+ 'creator_field' => 'author',
+ 'date_field' => 'date',
));
$handler->override_option('path', 'versioncontrol/garbage/path');
$handler->override_option('menu', array(
diff --git commitlog/includes/views/default_views/commitlog_user_commits.view.php commitlog/includes/views/default_views/commitlog_user_commits.view.php
index 62b9eca..f8e027b 100644
--- commitlog/includes/views/default_views/commitlog_user_commits.view.php
+++ commitlog/includes/views/default_views/commitlog_user_commits.view.php
@@ -354,12 +354,456 @@ $handler->override_option('cache', array(
$handler->override_option('use_pager', '1');
$handler->override_option('style_plugin', 'list');
$handler = $view->new_display('feed', 'Feed', 'feed');
+$handler->override_option('fields', array(
+ 'attribution' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'exclude' => 1,
+ 'id' => 'attribution',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'attribution',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'labels' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 1,
+ 'id' => 'labels',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'labels',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'revision' => array(
+ 'label' => 'Revision',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 0,
+ 'ellipsis' => 0,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'operation_format' => 'short',
+ 'exclude' => 1,
+ 'id' => 'revision',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'revision',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'nothing' => array(
+ 'label' => 'Title',
+ 'alter' => array(
+ 'text' => 'Commit [revision] on [labels] [attribution]',
+ 'make_link' => 0,
+ 'path' => '#',
+ 'link_class' => 'global-author',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 0,
+ 'id' => 'nothing',
+ 'table' => 'views',
+ 'field' => 'nothing',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'repo_id' => array(
+ 'label' => 'Repository ID',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'set_precision' => FALSE,
+ 'precision' => 0,
+ 'decimal' => '.',
+ 'separator' => ',',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'exclude' => 1,
+ 'id' => 'repo_id',
+ 'table' => 'versioncontrol_repositories',
+ 'field' => 'repo_id',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'revision_1' => array(
+ 'label' => 'Full Revision',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'operation_format' => 'full',
+ 'exclude' => 0,
+ 'id' => 'revision_1',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'revision',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'nothing_2' => array(
+ 'label' => 'Individual commit link',
+ 'alter' => array(
+ 'text' => 'commitlog/commit/[repo_id]/[revision_1]',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 0,
+ 'id' => 'nothing_2',
+ 'table' => 'views',
+ 'field' => 'nothing',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'vc_op_id' => array(
+ 'label' => 'Operation ID',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'strip_tags' => 0,
+ 'html' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'set_precision' => FALSE,
+ 'precision' => 0,
+ 'decimal' => '.',
+ 'separator' => ',',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'exclude' => 1,
+ 'id' => 'vc_op_id',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'vc_op_id',
+ 'relationship' => 'none',
+ ),
+ 'view' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => FALSE,
+ 'text' => '',
+ 'make_link' => FALSE,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => FALSE,
+ 'max_length' => '',
+ 'word_boundary' => TRUE,
+ 'ellipsis' => TRUE,
+ 'html' => FALSE,
+ 'strip_tags' => FALSE,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'view' => 'commitlog_commit_items',
+ 'display' => 'block_2',
+ 'arguments' => '[vc_op_id]',
+ 'query_aggregation' => 1,
+ 'exclude' => 0,
+ 'id' => 'view',
+ 'table' => 'views',
+ 'field' => 'view',
+ 'relationship' => 'none',
+ ),
+ 'message' => array(
+ 'label' => '',
+ 'alter' => array(
+ 'alter_text' => 1,
+ 'text' => '[message]
',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'issue_tracker_url' => '',
+ 'exclude' => 1,
+ 'id' => 'message',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'message',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'nothing_1' => array(
+ 'label' => 'Description',
+ 'alter' => array(
+ 'text' => '[view]
+[message]',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'exclude' => 0,
+ 'id' => 'nothing_1',
+ 'table' => 'views',
+ 'field' => 'nothing',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+ 'author' => array(
+ 'label' => 'Author',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'plain_text_output' => 1,
+ 'exclude' => 0,
+ 'id' => 'author',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'author',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ 'relationship' => 'none',
+ ),
+ 'date' => array(
+ 'label' => 'Date',
+ 'alter' => array(
+ 'alter_text' => 0,
+ 'text' => '',
+ 'make_link' => 0,
+ 'path' => '',
+ 'link_class' => '',
+ 'alt' => '',
+ 'prefix' => '',
+ 'suffix' => '',
+ 'target' => '',
+ 'help' => '',
+ 'trim' => 0,
+ 'max_length' => '',
+ 'word_boundary' => 1,
+ 'ellipsis' => 1,
+ 'html' => 0,
+ 'strip_tags' => 0,
+ ),
+ 'empty' => '',
+ 'hide_empty' => 0,
+ 'empty_zero' => 0,
+ 'date_format' => 'custom',
+ 'custom_date_format' => 'r',
+ 'link' => 0,
+ 'exclude' => 1,
+ 'id' => 'date',
+ 'table' => 'versioncontrol_operations',
+ 'field' => 'date',
+ 'relationship' => 'none',
+ 'override' => array(
+ 'button' => 'Use default',
+ ),
+ ),
+));
$handler->override_option('style_plugin', 'rss');
$handler->override_option('style_options', array(
'mission_description' => FALSE,
'description' => '',
));
$handler->override_option('row_plugin', 'versioncontrol_operations_rss');
+$handler->override_option('row_options', array(
+ 'relationship' => 'none',
+ 'title_field' => 'nothing',
+ 'link_field' => 'nothing_2',
+ 'description_field' => 'nothing_1',
+ 'creator_field' => 'author',
+ 'date_field' => 'date',
+));
$handler->override_option('path', 'versioncontrol/garbage/path');
$handler->override_option('menu', array(
'type' => 'none',
diff --git includes/views/handlers/versioncontrol_handler_field_operation_revision.inc includes/views/handlers/versioncontrol_handler_field_operation_revision.inc
index da22a39..1e445a6 100644
--- includes/views/handlers/versioncontrol_handler_field_operation_revision.inc
+++ includes/views/handlers/versioncontrol_handler_field_operation_revision.inc
@@ -27,6 +27,7 @@ class versioncontrol_handler_field_operation_revision extends views_handler_fiel
function option_definition() {
$options = parent::option_definition();
$options['plain_text_output'] = array('default' => 0, 'translatable' => TRUE);
+ $options['operation_format'] = array('default' => 'short', 'translatable' => TRUE);
return $options;
}
@@ -38,13 +39,20 @@ class versioncontrol_handler_field_operation_revision extends views_handler_fiel
'#default_value' => $this->options['plain_text_output'],
'#description' => t('Avoid markup and links on this field output.'),
);
+ $form['operation_format'] = array(
+ '#type' => 'radios',
+ '#title' => t('Revision format'),
+ '#default_value' => $this->options['operation_format'],
+ '#options' => array('full' => t('Full'), 'short' => t('Short')),
+ '#description' => t('The format mode the revision will use.'),
+ );
}
function render($values) {
$revision = $values->{$this->field_alias};
$vcs = $values->{$this->aliases['vcs']};
$repo_id = $values->{$this->aliases['repo_id']};
- $revision = $this->backends[$vcs]->formatRevisionIdentifier($revision, 'short');
+ $revision = $this->backends[$vcs]->formatRevisionIdentifier($revision, $this->options['operation_format']);
$repo = $this->getRepository($vcs, $repo_id);
if (!empty($this->options['plain_text_output'])) {
return check_plain($revision);
diff --git includes/views/plugins/versioncontrol_plugin_row_operation_rss.inc includes/views/plugins/versioncontrol_plugin_row_operation_rss.inc
index fe1e359..4a401eb 100644
--- includes/views/plugins/versioncontrol_plugin_row_operation_rss.inc
+++ includes/views/plugins/versioncontrol_plugin_row_operation_rss.inc
@@ -13,18 +13,11 @@ class versioncontrol_plugin_row_operation_rss extends views_plugin_row {
// Basic properties that let the row style follow relationships.
public $base_table = 'versioncontrol_operations';
public $base_field = 'vc_op_id';
- public $revision_alias = '';
- public $repo_id_alias = '';
- function query() {
- parent::query();
- $this->revision_alias = $this->view->query->add_field($this->base_table, 'revision');
- $this->repo_id_alias = $this->view->query->add_field($this->base_table, 'repo_id');
- }
function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
- $view_fields = array();
+ $view_fields = array('none' => t(''));
foreach ($this->display->handler->get_handlers('field') as $field => $handler) {
$view_fields[$field] = $handler->ui_name();
}
@@ -36,6 +29,13 @@ class versioncontrol_plugin_row_operation_rss extends views_plugin_row {
'#options' => $view_fields,
'#default_value' => $this->options['title_field'],
);
+ $form['link_field'] = array(
+ '#type' => 'select',
+ '#title' => t('Link field'),
+ '#description' => t('The field that is going to be used as the RSS item link for each row. This must be a drupal relative path.'),
+ '#options' => $view_fields,
+ '#default_value' => $this->options['link_field'],
+ );
$form['description_field'] = array(
'#type' => 'select',
'#title' => t('Description field'),
@@ -61,9 +61,9 @@ class versioncontrol_plugin_row_operation_rss extends views_plugin_row {
function validate() {
$errors = parent::validate();
- $required_options = array('title_field', 'description_field', 'creator_field', 'date_field');
+ $required_options = array('title_field', 'link_field', 'description_field', 'creator_field', 'date_field');
foreach ($required_options as $required_option) {
- if (empty($this->options[$required_option])) {
+ if (empty($this->options[$required_option]) || $this->options[$required_option] == 'none') {
$errors[] = t('Row style plugin requires specifying which views fields to use for RSS item.');
break;
}
@@ -73,19 +73,15 @@ class versioncontrol_plugin_row_operation_rss extends views_plugin_row {
function render($row) {
global $base_url;
- //TODO make sure this is the right way to deal with row_index
static $row_index;
if (!isset($row_index)) {
$row_index = 0;
}
$vc_op_id = $row->{$this->field_alias};
- $repo_id = $row->{$this->repo_id_alias};
- $revision = $row->{$this->revision_alias};
$item = new stdClass();
$item->title = $this->get_field($row_index, $this->options['title_field']);
- //TODO convert into another expected field
- $item->link = url(sprintf('commitlog/commit/%s/%s', $repo_id, $revision), array('absolute' => TRUE));
+ $item->link = url($this->get_field($row_index, $this->options['link_field']), array('absolute' => TRUE));
$item->description = $this->get_field($row_index, $this->options['description_field']);
$item->elements = array(
array('key' => 'pubDate', 'value' => $this->get_field($row_index, $this->options['date_field'])),
diff --git versioncontrol.module versioncontrol.module
index 11cca84..5f5fb4b 100644
--- versioncontrol.module
+++ versioncontrol.module
@@ -379,51 +379,6 @@ function versioncontrol_repository_load_multiple($ids = array(), $conditions = a
}
/**
- * Load multiple versioncontrol operations, given provided conditions and
- * options.
- *
- * @param $ids
- * @param $conditions
- * @param $options
- * @return array
- */
-function versioncontrol_operation_load_multiple($ids = array(), $conditions = array(), $options = array()) {
- $backends = versioncontrol_get_backends();
-
- // FIXME Stop working fine only if we pass $ids
- // Main problem here is figured out which controller to use to
- // avoid having a bad type for each operation object returned.
- if (!empty($ids)) {
- // Try to know which controller we need to use based on the vcs
- $query = db_select('versioncontrol_operations', 'vco');
- $query->join('versioncontrol_repositories', 'vcr', 'vco.repo_id = vcr.repo_id');
- $init_result = $query->fields('vco', array('vc_op_id'))
- ->fields('vcr', array('vcs'))
- ->condition('vco.vc_op_id', $ids, 'IN')
- ->execute();
- $vc_op_ids_by_vcs = array();
- foreach ($init_result as $record) {
- $vc_op_ids_by_vcs[$record->vcs][] = $record->vc_op_id;
- }
-
- $results = array();
- foreach ($vc_op_ids_by_vcs as $vcs => $vc_op_ids) {
- $vcs_results = $backends[$vcs]->loadEntities('operation', $vc_op_ids, $conditions, $options);
- $results += $vcs_results;
- }
- return $results;
- }
-
- $results = array();
- foreach ($backends as $vcs => $backend) {
- $vcs_results = $backend->loadEntities('operation', $ids, $conditions, $options);
- $results += $vcs_results;
- }
-
- return $results;
-}
-
-/**
* Get a list of all backends with its detailed information.
*
* @param string $backend