videos now work for groups

git-svn-id: http://code.elgg.org@6234 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/actions/add.php b/actions/add.php
index 528e65269cf92c2edaebd5915ce88c6450695654..87f459a3a30655adc63457da3314a504e279125e 100644 (file)
--- a/actions/add.php
+++ b/actions/add.php
@@ -23,7 +23,7 @@ if ($page_owner === false || is_null($page_owner)) {
        set_page_owner($_SESSION['guid']);
 }
 
-if($page_owner->type == "group") {
+if($page_owner instanceof ElggGroup) {
        $entity_referer = $page_owner->type.":".$page_owner->getGUID();
 } else {
        $entity_referer = $page_owner->username;

diff --git a/manifest.xml b/manifest.xml
index d627b963b24b51203de56fdd68e1f16df69f9115..52a2dcd4844e22302757001db2290b55eb943f2b 100644 (file)
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin_manifest>
-       <field key="author" value="Prateek Choudhary" />
-       <field key="version" value="1.8" />
-       <field key="description" value="Elgg Videolist" />
-       <field key="copyright" value="(C) prateek.choudhary 2008-09, Elgg 2010" />
-       <field key="licence" value="GNU Public License version 2" />
-       <field key="elgg_version" value="2010030101" />
-       <field key="admin_interface" value="simple" />
+               <field key="author" value="Prateek Choudhary" />
+               <field key="version" value="1.8" />
+               <field key="description" value="Elgg Videolist" />
+               <field key="copyright" value="(C) prateek.choudhary 2008-09, Elgg 2010" />
+               <field key="licence" value="GNU Public License version 2" />
+               <field key="elgg_version" value="2010030101" />
+               <field key="admin_interface" value="simple" />
        <field key="elgg_install_state" value="enabled" />
 </plugin_manifest>

diff --git a/views/default/forms/add.php b/views/default/forms/add.php
index 765bb9c090000a69712ee5a943d80efdeb8a320e..2ee5d9c2e1c248c07f633e3c966747d597040b60 100644 (file)
--- a/views/default/forms/add.php
+++ b/views/default/forms/add.php
@@ -30,6 +30,12 @@ if(page_owner_entity() instanceof ElggGroup){
 }else{
        $access_id = get_default_access(get_loggedin_user());
 }
+//if it is a group, pull out the group access view
+if(page_owner_entity() instanceof ElggGroup){
+       $options = group_access_options(page_owner_entity());
+}else{
+       $options = '';
+}
 $title_videourl = get_input('title_videourl');
 $Pagecontainer = get_input('page');
 $get_addvideourl = get_input('add_videourl');
@@ -149,7 +155,7 @@ $body .= elgg_view('input/tags', array('internalname' => 'videolisttags', 'value
 $body .= '</label></p>';
 
 $body .= '<p><label>'.elgg_echo("videolist:title_access").'<br />';
-$body .= elgg_view('input/access',array('internalname'=>'access_id', 'value' => $access_id));
+$body .= elgg_view('input/access',array('internalname'=>'access_id', 'value' => $access_id, 'options' => $options));
 $body .= '</label></p>';
 $body .= elgg_view('input/submit', array('internalname'=>'submit','value'=>elgg_echo('videolist:submit')));
 $body .= '</form>';

diff --git a/views/default/videolist/group_video_header.php b/views/default/videolist/group_video_header.php
index d3f59b77385799139f594ff8fe2e5f4fcce0ca51..dd12d1d967c0cff03fad9202ff9655d65b2edf10 100644 (file)
--- a/views/default/videolist/group_video_header.php
+++ b/views/default/videolist/group_video_header.php
@@ -6,7 +6,8 @@
 $user = page_owner_entity();\r
 $user_name = elgg_view_title($user->name . "'s " . elgg_echo('videos'));\r
 $url = $CONFIG->wwwroot . "pg/videolist/browse/". $user->username . "/";\r
-if(isloggedin())       \r
+//if the user is a memebr of the group, show find button\r
+if($user->isMember(get_loggedin_user()))\r
        $upload_link = "<a href=\"{$url}\" class='action_button'>" . elgg_echo('videolist:browsemenu') . '</a>';\r
 else\r
        $upload_link = '';\r