diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-07 10:12:20 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-07-07 10:12:20 +0000 |
| commit | 9dc03345ffe6eebb60f7e0a69539f21c52048dd6 (patch) | |
| tree | da6fede5185bd56474a5099d9b20b98a9312286e /mod/groups/views | |
| parent | 731660adbc2702f4566f8b5d106e01ccd722ab1c (diff) | |
| download | elgg-9dc03345ffe6eebb60f7e0a69539f21c52048dd6.tar.gz elgg-9dc03345ffe6eebb60f7e0a69539f21c52048dd6.tar.bz2 | |
Closes #120
git-svn-id: https://code.elgg.org/elgg/trunk@1306 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/groups/views')
| -rw-r--r-- | mod/groups/views/default/forms/groups/edit.php | 9 | ||||
| -rw-r--r-- | mod/groups/views/default/groups/menu/actions.php | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php index abb226464..4fcaa80a3 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -47,7 +47,14 @@ <p> <label> <?php echo elgg_echo('groups:membership'); ?><br /> - <?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id, 'options' => array( 0 => 'Private', 2=>'Public'))); ?> + <?php echo elgg_view('input/access', array('internalname' => 'membership','value' => $vars['entity']->membership, 'options' => array( 0 => 'Private', 2=>'Public'))); ?> + </label> + </p> + + <p> + <label> + <?php echo elgg_echo('groups:access'); ?><br /> + <?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $vars['entity']->access_id )); ?> </label> </p> diff --git a/mod/groups/views/default/groups/menu/actions.php b/mod/groups/views/default/groups/menu/actions.php index 8e1130871..4c27fea9b 100644 --- a/mod/groups/views/default/groups/menu/actions.php +++ b/mod/groups/views/default/groups/menu/actions.php @@ -17,7 +17,7 @@ } else { - if ($vars['entity']->access_id == 2) + if ($vars['entity']->isPublicMembership()) { ?><p><a href="<?php echo $vars['url']; ?>action/groups/join?group_guid=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("groups:join"); ?></a></p><?php } |