aboutsummaryrefslogtreecommitdiff
path: root/pages/friends
diff options
context:
space:
mode:
Diffstat (limited to 'pages/friends')
-rw-r--r--pages/friends/collections/add.php (renamed from pages/friends/add.php)9
-rw-r--r--pages/friends/collections/pickercallback.php (renamed from pages/friends/pickercallback.php)32
-rw-r--r--pages/friends/collections/view.php (renamed from pages/friends/collections.php)0
-rw-r--r--pages/friends/edit.php30
4 files changed, 30 insertions, 41 deletions
diff --git a/pages/friends/add.php b/pages/friends/collections/add.php
index 96da26ae1..51425db37 100644
--- a/pages/friends/add.php
+++ b/pages/friends/collections/add.php
@@ -13,10 +13,13 @@ $title = elgg_echo('friends:collections:add');
$content = elgg_view_title($title);
-$content .= elgg_view_form('friends/edit', array(), array(
+$form_body = elgg_view('forms/friends/collections/edit', array(
'friends' => get_user_friends(elgg_get_logged_in_user_guid(), "", 9999)
- )
-);
+));
+$content .= elgg_view('input/form', array(
+ 'action' => 'action/friends/collections/add',
+ 'body' => $form_body,
+));
$body = elgg_view_layout('one_sidebar', array('content' => $content));
diff --git a/pages/friends/pickercallback.php b/pages/friends/collections/pickercallback.php
index f613f1ae1..8da44d8c0 100644
--- a/pages/friends/pickercallback.php
+++ b/pages/friends/collections/pickercallback.php
@@ -7,7 +7,7 @@
*/
// Load Elgg engine
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+require_once(dirname(dirname(dirname(dirname(__FILE__)))) . "/engine/start.php");
$site_url = elgg_get_site_url();
@@ -32,22 +32,38 @@ if (!$pageowner) {
// Depending on the view type, launch a different view
switch($type) {
case 'list':
- $js_segment = elgg_view('core/friends/tablelistcountupdate',
- array('friendspicker' => $friendspicker, 'count' => sizeof($members)));
- $content = elgg_view('core/friends/tablelist',
- array('entities' => $members, 'content' => $js_segment));
+ $js_segment = elgg_view('core/friends/tablelistcountupdate', array(
+ 'friendspicker' => $friendspicker,
+ 'count' => sizeof($members),
+ ));
+ $content = elgg_view('core/friends/tablelist', array(
+ 'entities' => $members,
+ 'content' => $js_segment,
+ ));
break;
default:
$friends = $pageowner->getFriends('', 9999);
+ $params = array(
+ 'collection' => get_access_collection($collection),
+ 'friends' => $friends,
+ 'friendspicker' => $friendspicker,
+ );
+ $content = elgg_view_form('friends/collections/edit', array(), $params);
+ /*
+ $form_body = elgg_view('input/hidden', array(
+ 'name' => 'collection_id',
+ 'value' => get_access_collection($collection)->id,
+ ));
$content = elgg_view('input/friendspicker', array(
'entities' => $friends,
'value' => $members,
'callback' => true,
'friendspicker' => $friendspicker,
- 'formcontents' => elgg_view('forms/friends/collectionfields',
- array('collection' => get_access_collection($collection))),
- 'formtarget' => $site_url . 'action/friends/editcollection',
+ 'formcontents' => $form_body,
+ 'formtarget' => $site_url . 'action/friends/collections/edit',
));
+ *
+ */
break;
}
diff --git a/pages/friends/collections.php b/pages/friends/collections/view.php
index fa7527f4d..fa7527f4d 100644
--- a/pages/friends/collections.php
+++ b/pages/friends/collections/view.php
diff --git a/pages/friends/edit.php b/pages/friends/edit.php
deleted file mode 100644
index 665929319..000000000
--- a/pages/friends/edit.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Elgg add a collection of friends
- *
- * @package Elgg
- * @subpackage Core
- */
-
-// You need to be logged in for this one
-gatekeeper();
-
-$title = elgg_echo('friends:collectionedit');
-
-$content = elgg_view_title($title);
-
-//grab the collection id passed to the edit form
-$collection_id = get_input('collection');
-
-//get the full collection
-$collection = get_access_collection($collection_id);
-
-//get all members of the collection
-$collection_members = get_members_of_access_collection($collection_id);
-
-$content .= elgg_view_form('friends/edit', array(), array('collection' => $collection,
- 'collection_members' => $collection_members));
-
-$body = elgg_view_layout('one_sidebar', array('content' => $content));
-
-echo elgg_view_page($title, $body); \ No newline at end of file