Skip to content
This repository was archived by the owner on Feb 12, 2018. It is now read-only.

Commit 3226926

Browse files
peppertreepeppertree
committed
Final tweaks for 01.02.00 release
1 parent 82b5472 commit 3226926

19 files changed

+1197
-253
lines changed

‎App_LocalResources/Settings.ascx.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,4 +168,10 @@
168168
<data name="tabsites.Text" xml:space="preserve">
169169
<value>Sites</value>
170170
</data>
171+
<data name="AllRoles.Text" xml:space="preserve">
172+
<value>All Roles</value>
173+
</data>
174+
<data name="lblAdditionalControls.Help" xml:space="preserve">
175+
<value>Enter additonal controls to show in the editing interface. An example for one additonal control is as follows: &lt;strong&gt;My Data, /Desktopmodules/MyModule/MyControl.ascx&lt;/strong&gt; where &lt;strong&gt;My Data&lt;/strong&gt; is the tab name and the second part after the comma is the path to an existing control.</value>
176+
</data>
171177
</root>

‎App_LocalResources/View.ascx.resx‎

Lines changed: 88 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
<value>Grid</value>
203203
</data>
204204
<data name="lblPreferencesTab.Text" xml:space="preserve">
205-
<value>Preferences</value>
205+
<value>My Preferences</value>
206206
</data>
207207
<data name="cmdAuthorizeAccount.Text" xml:space="preserve">
208208
<value>Approve Account</value>
@@ -474,4 +474,91 @@
474474
<data name="ClickToSet.Text" xml:space="preserve">
475475
<value>Click here to set your password</value>
476476
</data>
477+
<data name="CreatedOnDate.Header" xml:space="preserve">
478+
<value>In Role since</value>
479+
</data>
480+
<data name="lblCancelNotificationText.Text" xml:space="preserve">
481+
<value>Cancel</value>
482+
</data>
483+
<data name="lblDontSendNotificationText.Text" xml:space="preserve">
484+
<value>Skip Notification</value>
485+
</data>
486+
<data name="lblRoleApprovalNote.Text" xml:space="preserve">
487+
<value>This will &lt;strong&gt;approve&lt;/strong&gt; the role membership of the selected account. Would you like to notify the user about that change? You can change the notification content in the next step.</value>
488+
</data>
489+
<data name="lblRoleApprovalTitle.Text" xml:space="preserve">
490+
<value>Approval of Role Membership</value>
491+
</data>
492+
<data name="lblSendNotificationText.Text" xml:space="preserve">
493+
<value>Send Notification</value>
494+
</data>
495+
<data name="RemoveFromRole.Text" xml:space="preserve">
496+
<value>Remove from Role</value>
497+
</data>
498+
<data name="RoleStatusApproved.Text" xml:space="preserve">
499+
<value>approved</value>
500+
</data>
501+
<data name="RoleStatusNoStatus.Text" xml:space="preserve">
502+
<value>disabled</value>
503+
</data>
504+
<data name="RoleStatusPending.Text" xml:space="preserve">
505+
<value>pending</value>
506+
</data>
507+
<data name="RoleStatusUnknown.Text" xml:space="preserve">
508+
<value>unknown</value>
509+
</data>
510+
<data name="Status.Header" xml:space="preserve">
511+
<value>Status</value>
512+
</data>
513+
<data name="cmdRestoreAccount.Text" xml:space="preserve">
514+
<value>Restore Account</value>
515+
</data>
516+
<data name="lblDeleteAccountNote.Text" xml:space="preserve">
517+
<value>This will move the acount into to the recycle bin. Are you sure?</value>
518+
</data>
519+
<data name="lblDeleteAccountTitle.Text" xml:space="preserve">
520+
<value>Delete Account</value>
521+
</data>
522+
<data name="lblDeleteCancel.Text" xml:space="preserve">
523+
<value>Cancel</value>
524+
</data>
525+
<data name="lblDeleteYes.Text" xml:space="preserve">
526+
<value>Yes, delete account</value>
527+
</data>
528+
<data name="lblHardDeleteAccountNote.Text" xml:space="preserve">
529+
<value>This will remove the account completely from your database. This action cannot be undone! Are you sure?</value>
530+
</data>
531+
<data name="lblHardDeleteAccountTitle.Text" xml:space="preserve">
532+
<value>Account Removal</value>
533+
</data>
534+
<data name="lblHardDeleteCancel.Text" xml:space="preserve">
535+
<value>Cancel</value>
536+
</data>
537+
<data name="lblHardDeleteYes.Text" xml:space="preserve">
538+
<value>Yes, delete this account</value>
539+
</data>
540+
<data name="lblRemoveAccountNote.Text" xml:space="preserve">
541+
<value>This will remove the account from the selected role. Are you sure?</value>
542+
</data>
543+
<data name="lblRemoveAccountTitle.Text" xml:space="preserve">
544+
<value>Remove from Role</value>
545+
</data>
546+
<data name="lblRemoveCancel.Text" xml:space="preserve">
547+
<value>Cancel</value>
548+
</data>
549+
<data name="lblRemoveYes.Text" xml:space="preserve">
550+
<value>Yes, remove from role</value>
551+
</data>
552+
<data name="lblRolePendingNote.Text" xml:space="preserve">
553+
<value>This will set the role membership of the selected account to &lt;strong&gt;pending&lt;/strong&gt;. Would you like to notify the user about the change? You can change the notification content in the next step.</value>
554+
</data>
555+
<data name="lblRolePendingTitle.Text" xml:space="preserve">
556+
<value>Pending Notification</value>
557+
</data>
558+
<data name="SetAccountApproved.Text" xml:space="preserve">
559+
<value>Set approved</value>
560+
</data>
561+
<data name="SetAccountPending.Text" xml:space="preserve">
562+
<value>Set pending</value>
563+
</data>
477564
</root>

‎Connect_AccountManagement.dnn‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="Connect AccountManagement" type="Module" version="01.01.00">
3+
<package name="Connect AccountManagement" type="Module" version="01.02.00">
44
<friendlyName>Connect: AccountManagement</friendlyName>
55
<description>A community module that handles account management in DNN</description>
66
<iconFile>Images/icon_extensions.gif</iconFile>
@@ -27,10 +27,15 @@
2727
<name>01.00.00.SqlDataProvider</name>
2828
<version>01.00.00</version>
2929
</script>
30+
<script type="Install">
31+
<path>Providers\DataProviders\SqlDataProvider</path>
32+
<name>01.02.00.SqlDataProvider</name>
33+
<version>01.02.00</version>
34+
</script>
3035
<script type="UnInstall">
3136
<path>Providers\DataProviders\SqlDataProvider</path>
3237
<name>Uninstall.SqlDataProvider</name>
33-
<version>01.00.00</version>
38+
<version>01.02.00</version>
3439
</script>
3540
</scripts>
3641
</component>

‎Connect_AccountManagement.vbproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@
172172
<Content Include="Settings.ascx" />
173173
<Content Include="Templates\Default\Email.Account.Created.txt" />
174174
<Content Include="Templates\Default\Email.Account.Data.txt" />
175+
<Content Include="Templates\Default\Email.RoleStatusChanged.txt" />
175176
<Content Include="Templates\Default\Email.AddedToRole.txt" />
176177
<Content Include="Templates\Default\Email.Password.Reset.txt" />
177178
<Content Include="Templates\Default\Email.RemovedFromRole.txt" />

‎Providers/DataProviders/SqlDataProvider/01.02.00.SqlDataProvider‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ SELECT DISTINCT
3030
(Select Top 1 [PropertyValue] From {databaseOwner}[{objectQualifier}UserProfile] Inner Join {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] On {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyDefinitionID] = {databaseOwner}[{objectQualifier}UserProfile].[PropertyDefinitionID] Where {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyName] = 'Country' and {databaseOwner}[{objectQualifier}UserProfile].[UserID] = U.[UserID]) as [Country],
3131
(Select Top 1 [PropertyValue] From {databaseOwner}[{objectQualifier}UserProfile] Inner Join {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] On {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyDefinitionID] = {databaseOwner}[{objectQualifier}UserProfile].[PropertyDefinitionID] Where {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyName] = 'Telephone' and {databaseOwner}[{objectQualifier}UserProfile].[UserID] = U.[UserID]) as [Telephone],
3232
(Select Top 1 [PropertyValue] From {databaseOwner}[{objectQualifier}UserProfile] Inner Join {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] On {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyDefinitionID] = {databaseOwner}[{objectQualifier}UserProfile].[PropertyDefinitionID] Where {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyName] = 'Cell' and {databaseOwner}[{objectQualifier}UserProfile].[UserID] = U.[UserID]) as [Cell],
33-
(Select Top 1 [PropertyValue] From {databaseOwner}[{objectQualifier}UserProfile] Inner Join {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] On {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyDefinitionID] = {databaseOwner}[{objectQualifier}UserProfile].[PropertyDefinitionID] Where {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyName] = 'PreferredLocale' and {databaseOwner}[{objectQualifier}UserProfile].[UserID] = U.[UserID]) as [PreferredLocale]
33+
(Select Top 1 [PropertyValue] From {databaseOwner}[{objectQualifier}UserProfile] Inner Join {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] On {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyDefinitionID] = {databaseOwner}[{objectQualifier}UserProfile].[PropertyDefinitionID] Where {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyName] = 'PreferredLocale' and {databaseOwner}[{objectQualifier}UserProfile].[UserID] = U.[UserID]) as [PreferredLocale],
34+
'' as Status,
35+
'' as RoleId
3436
FROM
3537
{databaseOwner}[{objectQualifier}Users] U
3638
INNER JOIN {databaseOwner}[{objectQualifier}UserPortals] UP on UP.[UserId] = U.[UserID]
@@ -65,6 +67,8 @@ AND
6567
or
6668
(@ShowDeleted = 1)
6769
)
70+
AND
71+
U.[IsSuperUser] = 0
6872
Order By
6973
UP.[CreatedDate] desc
7074
GO
@@ -90,19 +94,22 @@ SELECT DISTINCT
9094
(Select Top 1 [PropertyValue] From {databaseOwner}[{objectQualifier}UserProfile] Inner Join {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] On {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyDefinitionID] = {databaseOwner}[{objectQualifier}UserProfile].[PropertyDefinitionID] Where {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyName] = 'Cell' and {databaseOwner}[{objectQualifier}UserProfile].[UserID] = U.[UserID]) as [Cell],
9195
(Select Top 1 [PropertyValue] From {databaseOwner}[{objectQualifier}UserProfile] Inner Join {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] On {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyDefinitionID] = {databaseOwner}[{objectQualifier}UserProfile].[PropertyDefinitionID] Where {databaseOwner}[{objectQualifier}ProfilePropertyDefinition].[PropertyName] = 'PreferredLocale' and {databaseOwner}[{objectQualifier}UserProfile].[UserID] = U.[UserID]) as [PreferredLocale],
9296
UR.[Status],
93-
UR.[CreatedOnDate]
97+
UR.[CreatedOnDate],
98+
UR.[RoleId]
9499
FROM
95-
{databaseOwner}[{objectQualifier}Users] U
100+
{databaseOwner}[{objectQualifier}UserRoles] UR
101+
INNER JOIN {databaseOwner}[{objectQualifier}Users] U on U.[UserId] = UR.[UserId]
96102
INNER JOIN {databaseOwner}[{objectQualifier}UserPortals] UP on UP.[UserId] = U.[UserID]
97103
INNER JOIN {databaseOwner}[{objectQualifier}UserProfile] P on p.[UserID] = U.[UserID]
98104
INNER JOIN {databaseOwner}[{objectQualifier}ProfilePropertyDefinition] PD on PD.[PropertyDefinitionID] = p.[PropertyDefinitionID]
99-
INNER JOIN {databaseOwner}[{objectQualifier}UserRoles] UR on UR.[UserId] = U.[UserId]
100105
WHERE
101106
UP.[PortalId] = @PortalId
102107
AND
103108
UP.[IsDeleted] = 0
104109
AND
105-
(U.[UserID] in(Select [UserId] from {databaseOwner}[{objectQualifier}UserRoles] where [RoleID] = @RoleId))
110+
UR.[RoleId] = @RoleId
111+
AND
112+
U.[IsSuperUser] = 0
106113
Order By
107114
UR.[CreatedOnDate] desc
108115
GO

‎Providers/DataProviders/SqlDataProvider/Uninstall.SqlDataProvider‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11

2+
if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_GetUsers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
3+
drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_GetUsers]
4+
GO
5+
6+
if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Accounts_GetRoleMembers]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
7+
drop procedure {databaseOwner}[{objectQualifier}Connect_Accounts_GetRoleMembers]
8+
GO
9+
210
if exists (select * from dbo.sysobjects where id = object_id(N'{databaseOwner}[{objectQualifier}Connect_Users_ListByPortal]') and OBJECTPROPERTY(id, N'IsProcedure') = 1)
311
drop procedure {databaseOwner}[{objectQualifier}Connect_Users_ListByPortal]
412
GO

‎ReleaseNotes.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88
<div class="License">
99
<h3>Release Notes</h3>
1010

11+
<p class="Owner">
12+
<b>Version 01.02.00</b><br /><br />
13+
</p>
14+
<p>Extended Token Support</p>
15+
<h4>Changes</h4>
16+
<ul>
17+
<li>Change: When browsing a given role from within the tree, the grid now shows more details about the role membership, e.g. "In Role Since" column now shows the effectove date of the role membership and "status" shows the status of the role membership.</li>
18+
<li>New: You can now change the status of a role membership right from the grid</li>
19+
<li>New: You can now remove accounts from a given role right from the grid</li>
20+
<li>Change: Excluded host accounts from the result</li>
21+
</ul>
22+
1123
<p class="Owner">
1224
<b>Version 01.00.01</b><br /><br />
1325
</p>

‎Settings.ascx.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ Namespace Connect.Modules.UserManagement.AccountManagement
9898
chkAllowedRoles.DataSource = roles
9999
chkAllowedRoles.DataBind()
100100
chkAllowedRoles.Items.Add(New ListItem(Localization.GetString("DeletedAccounts", LocalResourceFile), "-2"))
101+
chkAllowedRoles.Items.Add(New ListItem(Localization.GetString("AllRoles", LocalResourceFile), "all"))
101102

102103
End Sub
103104

@@ -107,7 +108,6 @@ Namespace Connect.Modules.UserManagement.AccountManagement
107108
Next
108109
End Sub
109110

110-
111111
#End Region
112112

113113
End Class

‎Templates/Default/Email.RoleStatusChanged.txt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
<p>Dear [DISPLAYNAME],</p>
3+
<p>the status of a role membership on the <strong>[PORTALNAME]</strong> website has changed.</p>
4+
<table>
5+
<tr>
6+
<td>Website URL:</td><td><a href="http://[PORTALURL]">[PORTALURL]</a></td>
7+
</tr>
8+
<tr>
9+
<td>Role:</td><td>[ROLE]</td>
10+
</tr>
11+
<tr>
12+
<td>Status:</td><td>[Status]</td>
13+
</tr>
14+
<tr>
15+
<td>Your Username:</td><td>[USERNAME]</td>
16+
</tr>
17+
<tr>
18+
<td>Your Password:</td><td>[PASSWORD]</td>
19+
</tr>
20+
</table>
21+
<p>Best wishes,<br />the team from [PORTALNAME]</p>
22+

0 commit comments

Comments
 (0)