Skip to content

Fix roster role link in members, and remove role description top-level link in public. #1332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jefft wants to merge 4 commits into from
Closed

Fix roster role link in members, and remove role description top-level link in public. #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4f7377
Remove broken edit link from public/ and members/ view of roster role
jefft Oct 11, 2025
b5f6eaa
Fix roster role hyperlinks in /members. Fixes #1330
jefft Oct 11, 2025
6519847
Remove 'Display Role Description' menu in public/. Also rename 'Displ…
jefft Oct 11, 2025
ff1379a
Update members/views/view_0_roster_role_description.class.php
tbar0970 Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db_objects/roster_role.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ function printFieldValue($name, $value=NULL)
{
switch ($name) {
case 'details':
echo '<a class="pull-right" target="publicrole" href="'.BASE_URL.'/public/?view=display_role_description&role='.$this->id.'"><i class="icon-share"></i>View in public area</a>';
echo '<a class="pull-right" target="publicrole" href="'.BASE_URL.'/public/?view=_roster_role_description&role='.$this->id.'"><i class="icon-share"></i>View in public area</a>';
echo '<div class="text">'.$this->getValue($name).'</div>';
break;
case 'volunteer_group':
Expand Down
4 changes: 2 additions & 2 deletions db_objects/roster_view.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ private function _printOutputLabel($member, $service)
{
if ($member['role_id']) {
if (ifdef('PUBLIC_AREA_ENABLED', 1)) {
echo '<a class="med-popup" href="'.BASE_URL.'/public/?view=display_role_description&role='.(int)$member['role_id'].'">';
echo '<a class="med-popup" href="'.BASE_URL.'/public/?view=_roster_role_description&role='.(int)$member['role_id'].'">';
} else {
echo '<a class="med-popup" href="'.BASE_URL.'?view=rosters__define_roster_roles&roster_roleid='.(int)$member['role_id'].'">';
}
Expand Down Expand Up @@ -944,7 +944,7 @@ function _printRoleHeaders($editing, $public)
<?php
if ($details['role_id']) {
if ($public) {
echo '<a class="med-popup" href="'.BASE_URL.'/public/?view=display_role_description&role='.(int)$details['role_id'].'">';
echo '<a class="med-popup" href="?view=_roster_role_description&role='.(int)$details['role_id'].'">';
} else {
echo '<a class="med-popup" href="'.BASE_URL.'?view=rosters__define_roster_roles&roster_roleid='.(int)$details['role_id'].'">';
}
Expand Down
2 changes: 2 additions & 0 deletions members/views/view_0_roster_role_description.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?php
require_once dirname(__FILE__).'/../../public/views/view_0_roster_role_description.class.php';
2 changes: 1 addition & 1 deletion public/templates/roster_ical.template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
DESCRIPTION:Roster assignment: <?php
if ($alloc['cong'] )
echo $alloc['title'] . ', ' . $alloc['cong'] . ', ' . SYSTEM_NAME;
?>\n\n<?php echo 'Role description: ' . BASE_URL . '/public/?view=display_role_description&role=' . $alloc['id'] . ' ';
?>\n\n<?php echo 'Role description: ' . BASE_URL . '/public/?view=_roster_role_description&role=' . $alloc['id'] . ' ';
?> \n\nNote that start/end time is approximate.
END:VEVENT
<?php
Expand Down
5 changes: 2 additions & 3 deletions ...view_3_display_role_description.class.php → .../view_0_roster_role_description.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
class View_Display_Role_Description extends View
class View__Roster_Role_Description extends View
{
var $_role = null;

Expand All @@ -15,15 +15,14 @@ function getTitle()
if ($this->_role) {
return 'Roster Role: '.$this->_role->getFormattedValue('congregationid').' '.$this->_role->getValue('title');
} else {
return 'Display Role Description';
return 'Roster Roles';
}
}

function printView()
{
if ($this->_role) {
?>
<a class="soft pull-right no-print" href="<?php echo BASE_URL;?>?view=_edit_roster_role&roster_roleid=<?php echo $this->_role->id; ?>"><i class="icon-wrench"></i>Edit</a>
<?php
echo $this->_role->getValue('details');
} else {
Expand Down
4 changes: 2 additions & 2 deletions public/views/view_2_display_roster.class.php → public/views/view_2_rosters.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
class View_Display_Roster extends View
class View_Rosters extends View
{
var $_roster_view = null;

Expand All @@ -22,7 +22,7 @@ function getTitle()
if ($this->_roster_view) {
return $this->_roster_view->getValue('name');
} else {
return 'Display Roster';
return 'Roster';
}
}

Expand Down
2 changes: 1 addition & 1 deletion views/view_7_rosters__3_define_roster_roles.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function printView()
Roster roles are often congregation-specific; for example each congregation probably has its own separate "bible reader" role.
Other roles may be congregation-independent, such as cleaning or gardening. ');
if (PUBLIC_AREA_ENABLED) {
printf(_('Roster role descriptions can be viewed in the %s.'), '<a href="'.BASE_URL.'/public/?view=display_role_description">'._('public area of Jethro').'</a>');
printf(_('Roster role descriptions can be viewed in the %s.'), '<a href="'.BASE_URL.'/public/?view=_roster_role_description">'._('public area of Jethro').'</a>');
}
?>
</p>
Expand Down