Skip to content

Commit 8301c00

Browse files
themightychristhemightychris
authored
Merge pull request #252 from CodeForPhilly/develop
Release: v3.0.18
2 parents 61c9ec6 + 67bc7b2 commit 8301c00

File tree

4 files changed

+61
-32
lines changed

4 files changed

+61
-32
lines changed

‎html-templates/projects/project.tpl‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,23 @@
1010
<div class="btn-group">
1111
<a href="/projects/{$Project->Handle}/edit" class="btn btn-info">{_ "Edit Project"}</a>
1212
{if $.User}
13-
<button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
14-
<div class="dropdown-menu">
15-
<a class="dropdown-item" href="#add-member" data-toggle="modal">{_ "Add Member"}</a>
16-
<a class="dropdown-item" href="/project-buzz/create?ProjectID={$Project->ID}">{_ "Log Buzz"}</a>
17-
{if $.User && ($Project->hasMember($.User) || $.Session->hasAccountLevel('Staff'))}
18-
<a class="dropdown-item" href="#post-update" data-toggle="modal">{_ "Post Update"}</a>
19-
{/if}
20-
{if $.Session->hasAccountLevel('Staff')}
21-
<a class="dropdown-item" href="#manage-members" data-toggle="modal">{_ "Manage Members"}</a>
22-
{/if}
13+
<div class="btn-group">
14+
<button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
15+
<div class="dropdown-menu">
16+
<a class="dropdown-item" href="#add-member" data-toggle="modal">{_ "Add Member"}</a>
17+
<a class="dropdown-item" href="/project-buzz/create?ProjectID={$Project->ID}">{_ "Log Buzz"}</a>
18+
{if $.User && ($Project->hasMember($.User) || $.Session->hasAccountLevel('Staff'))}
19+
<a class="dropdown-item" href="#post-update" data-toggle="modal">{_ "Post Update"}</a>
20+
{/if}
21+
{if $.Session->hasAccountLevel('Staff')}
22+
<a class="dropdown-item" href="#manage-members" data-toggle="modal">{_ "Manage Members"}</a>
23+
{/if}
24+
</div>
2325
</div>
2426
{/if}
27+
{if $.User->hasAccountLevel('Staff')}
28+
<a class="btn btn-danger" href="{$Project->getUrl('/delete')|escape}">Delete Project</a>
29+
{/if}
2530
</div>
2631
</div>
2732

‎html-templates/subtemplates/people.tpl‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,41 @@
33
{template avatar Person size=32 pixelRatio=2 urlOnly=false forceSquare=true imgCls=no}{strip}
44
{$pixels = $size * $pixelRatio}
55

6-
{if $Person->PrimaryPhoto}
7-
{$src = $Person->PrimaryPhoto->getThumbnailRequest($pixels, $pixels, null, $forceSquare)}
8-
{else}
9-
{capture assign=src}//www.gravatar.com/avatar/{$Person->Email|strtolower|md5}?size={$pixels}&rating=g&default={Laddr::$gravatarDefault}{/capture}
10-
{/if}
6+
{if $Person}
7+
{if $Person->PrimaryPhoto}
8+
{$src = $Person->PrimaryPhoto->getThumbnailRequest($pixels, $pixels, null, $forceSquare)}
9+
{else}
10+
{capture assign=src}//www.gravatar.com/avatar/{$Person->Email|strtolower|md5}?size={$pixels}&rating=g&default={Laddr::$gravatarDefault}{/capture}
11+
{/if}
1112

12-
{if $urlOnly}
13-
{$src}
13+
{if $urlOnly}
14+
{$src}
15+
{else}
16+
<img height={$size} alt="{personName $Person}" src="{$src}" class="avatar{if $imgCls} {$imgCls}{/if}">
17+
{/if}
1418
{else}
15-
<img height={$size} alt="{personName $Person}" src="{$src}" class="avatar{if $imgCls} {$imgCls}{/if}">
19+
<span class="badge badge-pill badge-secondary">Deleted User</span>
1620
{/if}
1721
{/strip}{/template}
1822

1923
{template personLink Person photo=no photoSize=64 pixelRatio=2 linkCls=no imgCls=no nameCls=no summary=yes}{strip}
20-
<a href="{$Person->getURL()}" title="{personName $Person}" {if $linkCls}class="{$linkCls}"{/if}>
21-
{if $photo}
22-
{$pixels = $photoSize}
23-
{if $pixelRatio}
24-
{$pixels = $photoSize * $pixelRatio}
24+
{if $Person}
25+
<a href="{$Person->getURL()}" title="{personName $Person}" {if $linkCls}class="{$linkCls}"{/if}>
26+
{if $photo}
27+
{$pixels = $photoSize}
28+
{if $pixelRatio}
29+
{$pixels = $photoSize * $pixelRatio}
30+
{/if}
31+
{if $Person->PrimaryPhoto}
32+
{$src = $Person->PrimaryPhoto->getThumbnailRequest($pixels, $pixels)}
33+
{else}
34+
{capture assign=src}//www.gravatar.com/avatar/{$Person->Email|strtolower|md5}?size={$pixels}&rating=g&default={Laddr::$gravatarDefault}{/capture}
35+
{/if}
36+
<img src="{$src}" class="avatar {if $imgCls}{$imgCls}{/if}" width="{$photoSize}" height="{$photoSize}" />
2537
{/if}
26-
{if $Person->PrimaryPhoto}
27-
{$src = $Person->PrimaryPhoto->getThumbnailRequest($pixels, $pixels)}
28-
{else}
29-
{capture assign=src}//www.gravatar.com/avatar/{$Person->Email|strtolower|md5}?size={$pixels}&rating=g&default={Laddr::$gravatarDefault}{/capture}
30-
{/if}
31-
<img src="{$src}" class="avatar {if $imgCls}{$imgCls}{/if}" width="{$photoSize}" height="{$photoSize}" />
32-
{/if}
33-
<span class="name">{personName $Person summary=$summary}</span>
34-
</a>
38+
<span class="name">{personName $Person summary=$summary}</span>
39+
</a>
40+
{else}
41+
<span class="badge badge-pill badge-secondary">Deleted User</span>
42+
{/if}
3543
{/strip}{/template}

‎php-classes/Laddr/PeopleRequestHandler.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,12 @@ public static function handleRecordRequest(\ActiveRecord $Member, $action = fals
6868
return parent::handleRecordRequest($Member, $action);
6969
}
7070
}
71+
72+
protected static function onBeforeRecordDestroyed(\ActiveRecord $Person)
73+
{
74+
// delete project memberships
75+
foreach ($Person->ProjectMemberships as $ProjectMembership) {
76+
$ProjectMembership->destroy();
77+
}
78+
}
7179
}

‎php-classes/Laddr/ProjectsRequestHandler.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,4 +255,12 @@ protected static function applyRecordDelta(ActiveRecord $Project, $requestData)
255255

256256
return parent::applyRecordDelta($Project, $requestData);
257257
}
258+
259+
protected static function onBeforeRecordDestroyed(ActiveRecord $Project)
260+
{
261+
// delete project memberships
262+
foreach ($Project->Memberships as $ProjectMembership) {
263+
$ProjectMembership->destroy();
264+
}
265+
}
258266
}

0 commit comments

Comments
 (0)