Skip to content

Commit

Permalink
Merge pull request #11003 from jdalsem/widget-defaults
Browse files Browse the repository at this point in the history 
chore(widgets): no longer set default values in edit form
  • Loading branch information
@jdalsem
jdalsem committed Jul 24, 2017
2 parents 020134e + 98c96b6 commit 3a4aa47
Show file tree
Hide file tree
Showing 23 changed files with 44 additions and 59 deletions.
2 changes: 1 addition & 1 deletion mod/activity/views/default/widgets/group_activity/content.php
View file
Expand Up @@ -5,7 +5,7 @@

$widget = elgg_extract('entity', $vars);

$num = (int) $widget->num_display;
$num = (int) $widget->num_display ?: 8;
$guid = (int) $widget->group_guid;

if (empty($guid)) {
Expand Down
6 changes: 1 addition & 5 deletions mod/activity/views/default/widgets/group_activity/edit.php
View file
Expand Up @@ -28,13 +28,9 @@
'options_values' => $mygroups,
]);

// set default value
if (!isset($widget->num_display)) {
$widget->num_display = 8;
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'default' => 8,
]);

echo elgg_view('input/hidden', ['name' => 'title']);
4 changes: 3 additions & 1 deletion mod/blog/views/default/widgets/blog/content.php
View file
Expand Up @@ -5,11 +5,13 @@

$widget = elgg_extract('entity', $vars);

$num_display = (int) $widget->num_display ?: 4;

$content = elgg_list_entities([
'type' => 'object',
'subtype' => 'blog',
'container_guid' => $widget->owner_guid,
'limit' => $widget->num_display,
'limit' => $num_display,
'pagination' => false,
'distinct' => false,
]);
Expand Down
5 changes: 1 addition & 4 deletions mod/blog/views/default/widgets/blog/edit.php
View file
Expand Up @@ -4,13 +4,10 @@
*/

$widget = elgg_extract('entity', $vars);
// set default value
if (!isset($widget->num_display)) {
$widget->num_display = 4;
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'options' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
'label' => elgg_echo('blog:numbertodisplay'),
'default' => 4,
]);
4 changes: 3 additions & 1 deletion mod/bookmarks/views/default/widgets/bookmarks/content.php
View file
Expand Up @@ -5,11 +5,13 @@

$widget = elgg_extract('entity', $vars);

$num_display = (int) $widget->num_display ?: 4;

$content = elgg_list_entities([
'type' => 'object',
'subtype' => 'bookmarks',
'container_guid' => $widget->owner_guid,
'limit' => $widget->num_display,
'limit' => $num_display,
'pagination' => false,
'distinct' => false,
]);
Expand Down
5 changes: 1 addition & 4 deletions mod/bookmarks/views/default/widgets/bookmarks/edit.php
View file
Expand Up @@ -4,13 +4,10 @@
*/

$widget = elgg_extract('entity', $vars);
// set default value
if (!isset($widget->num_display)) {
$widget->num_display = 4;
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'options' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
'label' => elgg_echo('bookmarks:numbertodisplay'),
'default' => 4,
]);
4 changes: 3 additions & 1 deletion mod/file/views/default/widgets/filerepo/content.php
View file
Expand Up @@ -5,11 +5,13 @@

$widget = elgg_extract('entity', $vars);

$num_display = (int) $widget->num_display ?: 4;

$content = elgg_list_entities([
'type' => 'object',
'subtype' => 'file',
'container_guid' => $widget->owner_guid,
'limit' => $widget->num_display,
'limit' => $num_display,
'pagination' => false,
'distinct' => false,
]);
Expand Down
5 changes: 1 addition & 4 deletions mod/file/views/default/widgets/filerepo/edit.php
View file
Expand Up @@ -4,13 +4,10 @@
*/

$widget = elgg_extract('entity', $vars);
// set default value
if (!isset($widget->num_display)) {
$widget->num_display = 4;
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'options' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20],
'label' => elgg_echo('file:num_files'),
'default' => 4,
]);
2 changes: 1 addition & 1 deletion mod/friends/views/default/widgets/friends/content.php
View file
Expand Up @@ -21,7 +21,7 @@
'relationship' => 'friend',
'relationship_guid' => $owner->guid,
'limit' => $num_display,
'size' => $widget->icon_size,
'size' => $widget->icon_size ?: 'small',
'list_type' => 'gallery',
'pagination' => false,
'no_results' => elgg_echo('friends:none'),
Expand Down
7 changes: 1 addition & 6 deletions mod/friends/views/default/widgets/friends/edit.php
View file
Expand Up @@ -5,11 +5,6 @@

$widget = elgg_extract('entity', $vars);

// set default value for icon size
if (!isset($widget->icon_size)) {
$widget->icon_size = 'small';
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'default' => 12,
Expand All @@ -21,7 +16,7 @@
'#type' => 'select',
'name' => 'params[icon_size]',
'#label' => elgg_echo('friends:icon_size'),
'value' => $widget->icon_size,
'value' => $widget->icon_size ?: 'small',
'options_values' => [
'small' => elgg_echo('friends:small'),
'tiny' => elgg_echo('friends:tiny'),
Expand Down
4 changes: 3 additions & 1 deletion mod/groups/views/default/widgets/a_users_groups/content.php
View file
Expand Up @@ -5,11 +5,13 @@

$widget = elgg_extract('entity', $vars);

$num_display = (int) $widget->num_display ?: 4;

echo elgg_list_entities_from_relationship([
'type' => 'group',
'relationship' => 'member',
'relationship_guid' => $widget->owner_guid,
'limit' => $widget->num_display,
'limit' => $num_display,
'pagination' => false,
'no_results' => elgg_echo('groups:none'),
]);
Expand Down
5 changes: 1 addition & 4 deletions mod/groups/views/default/widgets/a_users_groups/edit.php
View file
Expand Up @@ -4,13 +4,10 @@
*/

$widget = elgg_extract('entity', $vars);
// set default value
if (!isset($widget->num_display)) {
$widget->num_display = 4;
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'options' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20],
'label' => elgg_echo('groups:widget:num_display'),
'default' => 4,
]);
4 changes: 3 additions & 1 deletion mod/messageboard/views/default/widgets/messageboard/content.php
View file
Expand Up @@ -10,10 +10,12 @@
echo elgg_view_form('messageboard/add', ['name' => 'elgg-messageboard']);
}

$num_display = (int) $widget->num_display ?: 5;

echo elgg_list_annotations([
'annotations_name' => 'messageboard',
'guid' => $owner->guid,
'limit' => $widget->num_display,
'limit' => $num_display,
'pagination' => false,
'reverse_order_by' => true,
]);
Expand Down
5 changes: 1 addition & 4 deletions mod/messageboard/views/default/widgets/messageboard/edit.php
View file
Expand Up @@ -4,13 +4,10 @@
*/

$widget = elgg_extract('entity', $vars);
// set default value
if (!isset($widget->num_display)) {
$widget->num_display = 5;
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'options' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
'label' => elgg_echo('messageboard:num_display'),
'default' => 5,
]);
4 changes: 3 additions & 1 deletion mod/pages/views/default/widgets/pages/content.php
View file
Expand Up @@ -5,11 +5,13 @@

$widget = elgg_extract('entity', $vars);

$num_display = (int) $widget->pages_num ?: 5;

$content = elgg_list_entities([
'type' => 'object',
'subtype' => 'page_top',
'container_guid' => $widget->owner_guid,
'limit' => $widget->pages_num,
'limit' => $num_display,
'pagination' => false,
]);

Expand Down
5 changes: 1 addition & 4 deletions mod/pages/views/default/widgets/pages/edit.php
View file
Expand Up @@ -4,14 +4,11 @@
*/

$widget = elgg_extract('entity', $vars);
// set default value
if (!isset($widget->pages_num)) {
$widget->pages_num = 5;
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'name' => 'pages_num',
'options' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
'label' => elgg_echo('pages:num'),
'default' => 5,
]);
6 changes: 5 additions & 1 deletion mod/reportedcontent/views/default/widgets/reportedcontent/content.php
View file
Expand Up @@ -3,10 +3,14 @@
* List the latest reports
*/

$widget = elgg_extract('entity', $vars);

$num_display = (int) $widget->num_display ?: 4;

$list = elgg_list_entities_from_metadata([
'type' => 'object',
'subtype' => 'reported_content',
'limit' => $vars['entity']->num_display,
'limit' => $num_display,
'pagination' => false,
'order_by_metadata' => [
'name' => 'state',
Expand Down
5 changes: 1 addition & 4 deletions mod/reportedcontent/views/default/widgets/reportedcontent/edit.php
View file
Expand Up @@ -4,13 +4,10 @@
*/

$widget = elgg_extract('entity', $vars);
// set default value
if (!isset($widget->num_display)) {
$widget->num_display = 4;
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'options' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
'label' => elgg_echo('reportedcontent:numbertodisplay'),
'default' => 4,
]);
4 changes: 3 additions & 1 deletion mod/tagcloud/views/default/widgets/tagcloud/content.php
View file
Expand Up @@ -5,11 +5,13 @@

$widget = elgg_extract('entity', $vars);

$num_display = (int) $widget->num_items ?: 30;

elgg_push_context('tags');
echo elgg_view_tagcloud([
'owner_guid' => $widget->owner_guid,
'threshold' => 1,
'limit' => $widget->num_items,
'limit' => $num_display,
'tag_name' => 'tags',
]);
elgg_pop_context();
5 changes: 1 addition & 4 deletions mod/tagcloud/views/default/widgets/tagcloud/edit.php
View file
Expand Up @@ -4,14 +4,11 @@
*/

$widget = elgg_extract('entity', $vars);
// set default value
if (!isset($widget->num_items)) {
$widget->num_items = 30;
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'name' => 'num_items',
'options' => [10, 20, 30, 50, 100],
'label' => elgg_echo('tagcloud:widget:numtags'),
'default' => 30,
]);
4 changes: 3 additions & 1 deletion mod/thewire/views/default/widgets/thewire/content.php
View file
Expand Up @@ -5,11 +5,13 @@

$widget = elgg_extract('entity', $vars);

$num_display = (int) $widget->num_display ?: 4;

$content = elgg_list_entities([
'type' => 'object',
'subtype' => 'thewire',
'container_guid' => $widget->owner_guid,
'limit' => $widget->num_display,
'limit' => $num_display,
'pagination' => false,
]);

Expand Down
5 changes: 1 addition & 4 deletions mod/thewire/views/default/widgets/thewire/edit.php
View file
Expand Up @@ -4,13 +4,10 @@
*/

$widget = elgg_extract('entity', $vars);
// set default value
if (!isset($widget->num_display)) {
$widget->num_display = 4;
}

echo elgg_view('object/widget/edit/num_display', [
'entity' => $widget,
'options' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
'label' => elgg_echo('thewire:num'),
'default' => 4,
]);
3 changes: 2 additions & 1 deletion views/default/widgets/river_widget/content.php
View file
Expand Up @@ -18,7 +18,8 @@
];

if (elgg_in_context('dashboard')) {
if ($widget->content_type == 'friends') {
$content_type = $widget->content_type ?: 'friends';
if ($content_type == 'friends') {
$options['relationship_guid'] = $widget->getOwnerGUID();
$options['relationship'] = 'friend';
}
Expand Down

0 comments on commit 3a4aa47

Please sign in to comment.