Skip to content

Commit

Permalink
Merge pull request #29 from dropbox/jack/601
Browse files Browse the repository at this point in the history 
6.0.1 update
  • Loading branch information
@chadduffey
chadduffey authored Jun 8, 2017
2 parents 42f88fd + 4b927bb commit a66be55
Show file tree
Hide file tree
Showing 11 changed files with 268 additions and 76 deletions.
Binary file modified Installer/DBAdminToolkit.Setup.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
![Dropbox Business Admin Toolkit](https://dl.dropboxusercontent.com/u/354544978/MKTG-DEMO/static/dropbox_s.png)

## Release 6.0
## Release 6.0.1

## Features

Expand Down
2 changes: 1 addition & 1 deletion Source/DBAdminToolkit.Setup/DBAdminToolkit.Setup.vdproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1072,7 +1072,7 @@
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:6.0.0"
"ProductVersion" = "8:6.0.1"
"Manufacturer" = "8:Dropbox Enterprise Services"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down
4 changes: 2 additions & 2 deletions Source/DfBAdminToolkit.Common/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")]
[assembly: AssemblyVersion("6.0.1.0")]
[assembly: AssemblyFileVersion("6.0.1.0")]
2 changes: 1 addition & 1 deletion Source/DfBAdminToolkit/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<add key="ApiVersion" value="2" />

<!-- API Actions & params -->
<add key="ConfigVersion" value="6.0.0.0" />
<add key="ConfigVersion" value="6.0.1.0" />
<add key="SearchDefaultLimit" value="1000" />
<add key="SearchFileCountLimit" value="1000" />
<add key="SuppressFilenamesInStatus" value="0" />
Expand Down
2 changes: 1 addition & 1 deletion Source/DfBAdminToolkit/ConfigBackup/DfBAdminToolkit.exe.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<add key="ApiVersion" value="2" />

<!-- API Actions & params -->
<add key="ConfigVersion" value="6.0.0.0" />
<add key="ConfigVersion" value="6.0.1.0" />
<add key="SearchDefaultLimit" value="1000" />
<add key="SearchFileCountLimit" value="1000" />
<add key="SuppressFilenamesInStatus" value="0" />
Expand Down
2 changes: 1 addition & 1 deletion Source/DfBAdminToolkit/Install Config/DfBAdminToolkit.exe.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<add key="ApiVersion" value="2" />

<!-- API Actions & params -->
<add key="ConfigVersion" value="6.0.0.0" />
<add key="ConfigVersion" value="6.0.1.0" />
<add key="SearchDefaultLimit" value="1000" />
<add key="SearchFileCountLimit" value="1000" />
<add key="SuppressFilenamesInStatus" value="0" />
Expand Down
74 changes: 49 additions & 25 deletions Source/DfBAdminToolkit/Presenter/TeamAuditingPresenter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ private void GetEvents(ITeamAuditingModel model, ITeamAuditingView view, IMainPr
}
dynamic actorType = null;
string actorTypeString = string.Empty;
dynamic emailObj = null;
string email = string.Empty;
if (events["actor"][".tag"] != null)
{
actorType = events["actor"][".tag"];
actorTypeString = actorType.Value as string;
}
dynamic emailObj = null;
string email = string.Empty;
}
if (actorTypeString == "user")
{
//non team member check first
Expand All @@ -151,18 +151,27 @@ private void GetEvents(ITeamAuditingModel model, ITeamAuditingView view, IMainPr
}
if (actorTypeString == "admin")
{
emailObj = events["actor"]["app"]["display_name"];
email = emailObj;
if (events["actor"]["admin"]["display_name"] != null)
{
emailObj = events["actor"]["admin"]["display_name"];
email = emailObj;
}
}
if (actorTypeString == "app")
{
emailObj = events["actor"]["app"]["display_name"];
email = emailObj;
if (events["actor"]["app"]["display_name"] != null)
{
emailObj = events["actor"]["app"]["display_name"];
email = emailObj;
}
}
if (actorTypeString == "reseller")
{
emailObj = events["actor"]["reseller"]["reseller_name"];
email = emailObj;
if (events["actor"]["reseller"]["reseller_name"] != null)
{
emailObj = events["actor"]["reseller"]["reseller_name"];
email = emailObj;
}
}
if (actorTypeString == "dropbox")
{
Expand All @@ -180,8 +189,11 @@ private void GetEvents(ITeamAuditingModel model, ITeamAuditingView view, IMainPr

if (contextTypeString == "team_member")
{
contextObj = events["context"]["email"];
context = contextObj.Value as string;
if (events["context"]["email"] != null)
{
contextObj = events["context"]["email"];
context = contextObj.Value as string;
}
}
if (contextTypeString == "non_team_member")
{
Expand Down Expand Up @@ -443,13 +455,13 @@ private void GetEvents(ITeamAuditingModel model, ITeamAuditingView view, IMainPr
}
dynamic actorType = null;
string actorTypeString = string.Empty;
dynamic emailObj = null;
string email = string.Empty;
if (events["actor"][".tag"] != null)
{
actorType = events["actor"][".tag"];
actorTypeString = actorType.Value as string;
}
dynamic emailObj = null;
string email = string.Empty;
if (actorTypeString == "user")
{
//non team member check first
Expand All @@ -467,18 +479,27 @@ private void GetEvents(ITeamAuditingModel model, ITeamAuditingView view, IMainPr
}
if (actorTypeString == "admin")
{
emailObj = events["actor"]["app"]["display_name"];
email = emailObj;
if (events["actor"]["admin"]["display_name"] != null)
{
emailObj = events["actor"]["admin"]["display_name"];
email = emailObj;
}
}
if (actorTypeString == "app")
{
emailObj = events["actor"]["app"]["display_name"];
email = emailObj;
if (events["actor"]["app"]["display_name"] != null)
{
emailObj = events["actor"]["app"]["display_name"];
email = emailObj;
}
}
if (actorTypeString == "reseller")
{
emailObj = events["actor"]["reseller"]["reseller_name"];
email = emailObj;
if (events["actor"]["reseller"]["reseller_name"] != null)
{
emailObj = events["actor"]["reseller"]["reseller_name"];
email = emailObj;
}
}
if (actorTypeString == "dropbox")
{
Expand All @@ -493,11 +514,14 @@ private void GetEvents(ITeamAuditingModel model, ITeamAuditingView view, IMainPr
{
contextTypeObj = events["context"][".tag"];
contextTypeString = contextTypeObj.Value as string;

if (contextTypeString == "team_member")
{
contextObj = events["context"]["email"];
context = contextObj.Value as string;
if (events["context"]["email"] != null)
{
contextObj = events["context"]["email"];
context = contextObj.Value as string;
}
}
if (contextTypeString == "non_team_member")
{
Expand Down Expand Up @@ -671,8 +695,6 @@ private void GetEvents(ITeamAuditingModel model, ITeamAuditingView view, IMainPr
{
timestamp = timestampObj;
}


if (region != "Unknown" || region != "")
{
region = FileUtil.ConvertStateToAbbreviation(region);
Expand Down Expand Up @@ -722,6 +744,8 @@ private void GetEvents(ITeamAuditingModel model, ITeamAuditingView view, IMainPr
EventCount++;
}
}
hasMore = jsonDataCont["has_more"];
cursor = jsonDataCont["cursor"];
}
}
}
Expand Down Expand Up @@ -871,7 +895,7 @@ private void OnCommandFilterMembers(object sender, EventArgs e)
{
newAudit = new List<TeamAuditingListViewItemModel>();
newAudit = view.RenderTeamAuditingFilteredMemberList(members, model.TeamAuditing, newAudit);
presenter.UpdateProgressInfo("Filtering complete.");
presenter.UpdateProgressInfo("Filtering complete. Events loaded [" + newAudit.Count + "]");
presenter.ActivateSpinner(false);
presenter.EnableControl(true);
}, null);
Expand Down
Loading

0 comments on commit a66be55

Please sign in to comment.