jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: simplify document template managed groups

Browse Source
This commit is contained in:
Gary Sharp
2022-12-04 12:24:39 +11:00
parent dff47c0e8b
commit b0fddd491b
6 changed files with 181 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Config/Views/Shared/LinkedGroupInstance.cshtml
+18 -18
View File
@@ -19,23 +19,23 @@
{
if (group != null)
{
<div class="code" title="@group.Id">
<i class="fa fa-fw fa-lg fa-link success"></i>@group.Domain.FriendlyDistinguishedNamePath(group.DistinguishedName)
</div>
<button class="button small Config_LinkedGroup_LinkButton" data-linkedgroupid="@(Model.ManagedGroup.Configuration.GroupId)" data-linkedgroupfilterdateoption="@(Model.ManagedGroup.IncludeFilterBeginDate)" data-linkedgroupfilterdate="@(Model.ManagedGroup.Configuration.FilterBeginDate)" data-linkedroupdescription="@(Model.CategoryDescription)" data-linkedroupupdateurl="@(Model.UpdateUrl)">Change Link</button>
<a href="@(Url.Action(MVC.API.System.SyncActiveDirectoryManagedGroup(Model.ManagedGroup.Key, Context.Request.Path)))" class="button small">Synchronize Now</a>
<div class="code" title="@group.Id">
<i class="fa fa-fw fa-lg fa-link success"></i>@group.Domain.FriendlyDistinguishedNamePath(group.DistinguishedName)
</div>
<button class="button small Config_LinkedGroup_LinkButton" data-linkedgroupid="@(Model.ManagedGroup.Configuration.GroupId)" data-linkedgroupfilterdateoption="@(Model.ManagedGroup.IncludeFilterBeginDate)" data-linkedgroupfilterdate="@(Model.ManagedGroup.Configuration.FilterBeginDate)" data-linkedroupdescription="@(Model.CategoryDescription)" data-linkedroupupdateurl="@(Model.UpdateUrl)">Change Link</button>
<a href="@(Url.Action(MVC.API.System.SyncActiveDirectoryManagedGroup(Model.ManagedGroup.Key, Context.Request.Path)))" class="button small">Synchronize Now</a>
}
else
{
<div class="code error">
<i class="fa fa-fw fa-lg fa-unlink error"></i>Group Not Found: <strong class="code">@Model.ManagedGroup.Configuration.GroupId</strong>
</div>
<button class="button small Config_LinkedGroup_LinkButton" data-linkedgroupid="@(Model.ManagedGroup.Configuration.GroupId)" data-linkedgroupfilterdateoption="@(Model.ManagedGroup.IncludeFilterBeginDate)" data-linkedgroupfilterdate="@(Model.ManagedGroup.Configuration.FilterBeginDate)" data-linkedroupdescription="@(Model.CategoryDescription)" data-linkedroupupdateurl="@(Model.UpdateUrl)">Change Link</button>
<div class="code error">
<i class="fa fa-fw fa-lg fa-unlink error"></i>Group Not Found: <strong class="code">@Model.ManagedGroup.Configuration.GroupId</strong>
</div>
<button class="button small Config_LinkedGroup_LinkButton" data-linkedgroupid="@(Model.ManagedGroup.Configuration.GroupId)" data-linkedgroupfilterdateoption="@(Model.ManagedGroup.IncludeFilterBeginDate)" data-linkedgroupfilterdate="@(Model.ManagedGroup.Configuration.FilterBeginDate)" data-linkedroupdescription="@(Model.CategoryDescription)" data-linkedroupupdateurl="@(Model.UpdateUrl)">Change Link</button>
}
}
else
{
<button class="button small Config_LinkedGroup_LinkButton" data-linkedgroupid="" data-linkedgroupfilterdateoption="@(Model.IncludeFilterBeginDate)" data-linkedroupdescription="@(Model.CategoryDescription)" data-linkedroupupdateurl="@(Model.UpdateUrl)">Link Group</button>
<button class="button small Config_LinkedGroup_LinkButton" data-linkedgroupid="" data-linkedgroupfilterdateoption="@(Model.IncludeFilterBeginDate)" data-linkedroupdescription="@(Model.CategoryDescription)" data-linkedroupupdateurl="@(Model.UpdateUrl)">Link Group</button>
}
}
else
@@ -44,21 +44,21 @@
{
if (group != null)
{
<div class="code" title="@group.Id">
<i class="fa fa-fw fa-lg fa-link success"></i>@group.Domain.FriendlyDistinguishedNamePath(group.DistinguishedName)
</div>
<div class="code" title="@group.Id">
<i class="fa fa-fw fa-lg fa-link success"></i>@group.Domain.FriendlyDistinguishedNamePath(group.DistinguishedName)
</div>
}
else
{
<div class="code error">
<i class="fa fa-fw fa-lg fa-unlink error"></i>Group Not Found: <strong class="code">@Model.ManagedGroup.Configuration.GroupId</strong>
</div>
<div class="code error">
<i class="fa fa-fw fa-lg fa-unlink error"></i>Group Not Found: <strong class="code">@Model.ManagedGroup.Configuration.GroupId</strong>
</div>
}
}
else
{
<div class="smallMessage"><i class="fa fa-fw fa-lg fa-unlink information"></i>No Group Linked</div>
<div class="smallMessage"><i class="fa fa-fw fa-lg fa-unlink information"></i>No Group Linked</div>
}
}
}
}
</div>
Disco.Web/Areas/Config/Views/Shared/LinkedGroupInstance.generated.cs
+44 -44
View File
@@ -109,21 +109,21 @@ WriteLiteral("\r\n </p>\r\n </div>\r\n");
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" <div");
WriteLiteral(" class=\"code\"");
WriteAttribute("title", Tuple.Create(" title=\"", 681), Tuple.Create("\"", 698)
WriteAttribute("title", Tuple.Create(" title=\"", 693), Tuple.Create("\"", 710)
#line 22 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
, Tuple.Create(Tuple.Create("", 689), Tuple.Create<System.Object, System.Int32>(group.Id
, Tuple.Create(Tuple.Create("", 701), Tuple.Create<System.Object, System.Int32>(group.Id
#line default
#line hidden
, 689), false)
, 701), false)
);
WriteLiteral(">\r\n <i");
WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-fw fa-lg fa-link success\"");
@@ -131,14 +131,14 @@ WriteLiteral("></i>");
#line 23 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(group.Domain.FriendlyDistinguishedNamePath(group.DistinguishedName));
Write(group.Domain.FriendlyDistinguishedNamePath(group.DistinguishedName));
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n");
WriteLiteral("\r\n </div>\r\n");
WriteLiteral(" <button");
WriteLiteral(" <button");
WriteLiteral(" class=\"button small Config_LinkedGroup_LinkButton\"");
@@ -146,7 +146,7 @@ WriteLiteral(" data-linkedgroupid=\"");
#line 25 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.ManagedGroup.Configuration.GroupId);
Write(Model.ManagedGroup.Configuration.GroupId);
#line default
@@ -157,7 +157,7 @@ WriteLiteral(" data-linkedgroupfilterdateoption=\"");
#line 25 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.ManagedGroup.IncludeFilterBeginDate);
Write(Model.ManagedGroup.IncludeFilterBeginDate);
#line default
@@ -168,7 +168,7 @@ WriteLiteral(" data-linkedgroupfilterdate=\"");
#line 25 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.ManagedGroup.Configuration.FilterBeginDate);
Write(Model.ManagedGroup.Configuration.FilterBeginDate);
#line default
@@ -179,7 +179,7 @@ WriteLiteral(" data-linkedroupdescription=\"");
#line 25 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.CategoryDescription);
Write(Model.CategoryDescription);
#line default
@@ -190,7 +190,7 @@ WriteLiteral(" data-linkedroupupdateurl=\"");
#line 25 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.UpdateUrl);
Write(Model.UpdateUrl);
#line default
@@ -199,16 +199,16 @@ WriteLiteral("\"");
WriteLiteral(">Change Link</button>\r\n");
WriteLiteral(" <a");
WriteLiteral(" <a");
WriteAttribute("href", Tuple.Create(" href=\"", 1275), Tuple.Create("\"", 1389)
WriteAttribute("href", Tuple.Create(" href=\"", 1335), Tuple.Create("\"", 1449)
#line 26 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
, Tuple.Create(Tuple.Create("", 1282), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.System.SyncActiveDirectoryManagedGroup(Model.ManagedGroup.Key, Context.Request.Path))
, Tuple.Create(Tuple.Create("", 1342), Tuple.Create<System.Object, System.Int32>(Url.Action(MVC.API.System.SyncActiveDirectoryManagedGroup(Model.ManagedGroup.Key, Context.Request.Path))
#line default
#line hidden
, 1282), false)
, 1342), false)
);
WriteLiteral(" class=\"button small\"");
@@ -224,11 +224,11 @@ WriteLiteral(">Synchronize Now</a>\r\n");
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" <div");
WriteLiteral(" class=\"code error\"");
WriteLiteral(">\r\n <i");
WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-fw fa-lg fa-unlink error\"");
@@ -240,14 +240,14 @@ WriteLiteral(">");
#line 31 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.ManagedGroup.Configuration.GroupId);
Write(Model.ManagedGroup.Configuration.GroupId);
#line default
#line hidden
WriteLiteral("</strong>\r\n </div> \r\n");
WriteLiteral("</strong>\r\n </div>\r\n");
WriteLiteral(" <button");
WriteLiteral(" <button");
WriteLiteral(" class=\"button small Config_LinkedGroup_LinkButton\"");
@@ -255,7 +255,7 @@ WriteLiteral(" data-linkedgroupid=\"");
#line 33 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.ManagedGroup.Configuration.GroupId);
Write(Model.ManagedGroup.Configuration.GroupId);
#line default
@@ -266,7 +266,7 @@ WriteLiteral(" data-linkedgroupfilterdateoption=\"");
#line 33 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.ManagedGroup.IncludeFilterBeginDate);
Write(Model.ManagedGroup.IncludeFilterBeginDate);
#line default
@@ -277,7 +277,7 @@ WriteLiteral(" data-linkedgroupfilterdate=\"");
#line 33 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.ManagedGroup.Configuration.FilterBeginDate);
Write(Model.ManagedGroup.Configuration.FilterBeginDate);
#line default
@@ -288,7 +288,7 @@ WriteLiteral(" data-linkedroupdescription=\"");
#line 33 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.CategoryDescription);
Write(Model.CategoryDescription);
#line default
@@ -299,7 +299,7 @@ WriteLiteral(" data-linkedroupupdateurl=\"");
#line 33 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.UpdateUrl);
Write(Model.UpdateUrl);
#line default
@@ -318,7 +318,7 @@ WriteLiteral(">Change Link</button>\r\n");
#line default
#line hidden
WriteLiteral(" <button");
WriteLiteral(" <button");
WriteLiteral(" class=\"button small Config_LinkedGroup_LinkButton\"");
@@ -328,7 +328,7 @@ WriteLiteral(" data-linkedgroupfilterdateoption=\"");
#line 38 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.IncludeFilterBeginDate);
Write(Model.IncludeFilterBeginDate);
#line default
@@ -339,7 +339,7 @@ WriteLiteral(" data-linkedroupdescription=\"");
#line 38 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.CategoryDescription);
Write(Model.CategoryDescription);
#line default
@@ -350,7 +350,7 @@ WriteLiteral(" data-linkedroupupdateurl=\"");
#line 38 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.UpdateUrl);
Write(Model.UpdateUrl);
#line default
@@ -373,21 +373,21 @@ WriteLiteral(">Link Group</button>\r\n");
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" <div");
WriteLiteral(" class=\"code\"");
WriteAttribute("title", Tuple.Create(" title=\"", 2661), Tuple.Create("\"", 2678)
WriteAttribute("title", Tuple.Create(" title=\"", 2777), Tuple.Create("\"", 2794)
#line 47 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
, Tuple.Create(Tuple.Create("", 2669), Tuple.Create<System.Object, System.Int32>(group.Id
, Tuple.Create(Tuple.Create("", 2785), Tuple.Create<System.Object, System.Int32>(group.Id
#line default
#line hidden
, 2669), false)
, 2785), false)
);
WriteLiteral(">\r\n <i");
WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-fw fa-lg fa-link success\"");
@@ -395,12 +395,12 @@ WriteLiteral("></i>");
#line 48 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(group.Domain.FriendlyDistinguishedNamePath(group.DistinguishedName));
Write(group.Domain.FriendlyDistinguishedNamePath(group.DistinguishedName));
#line default
#line hidden
WriteLiteral("\r\n </div>\r\n");
WriteLiteral("\r\n </div>\r\n");
#line 50 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
@@ -411,11 +411,11 @@ WriteLiteral("\r\n </div>\r\n");
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" <div");
WriteLiteral(" class=\"code error\"");
WriteLiteral(">\r\n <i");
WriteLiteral(">\r\n <i");
WriteLiteral(" class=\"fa fa-fw fa-lg fa-unlink error\"");
@@ -427,12 +427,12 @@ WriteLiteral(">");
#line 54 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
Write(Model.ManagedGroup.Configuration.GroupId);
Write(Model.ManagedGroup.Configuration.GroupId);
#line default
#line hidden
WriteLiteral("</strong>\r\n </div> \r\n");
WriteLiteral("</strong>\r\n </div>\r\n");
#line 56 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
@@ -444,7 +444,7 @@ WriteLiteral("</strong>\r\n </div> \r\n");
#line default
#line hidden
WriteLiteral(" <div");
WriteLiteral(" <div");
WriteLiteral(" class=\"smallMessage\"");
@@ -457,7 +457,7 @@ WriteLiteral("></i>No Group Linked</div>\r\n");
#line 61 "..\..\Areas\Config\Views\Shared\LinkedGroupInstance.cshtml"
}
}
}
#line default
Disco.Web/Areas/Config/Views/Shared/LinkedGroupShared.cshtml
+4 -4
View File
@@ -34,10 +34,10 @@
</div>
<script>
$(function () {
var dialog;
var dialogGroupId;
var dialogFilterDate;
var dialogTitle;
let dialog;
let dialogGroupId;
let dialogFilterDate;
let dialogTitle;
function showDialog(groupId, filterDateOption, filterDateValue, updateUrl, title) {
if (dialog == null) {
Disco.Web/Areas/Config/Views/Shared/LinkedGroupShared.generated.cs
+4 -4
View File
@@ -125,10 +125,10 @@ WriteLiteral(@"></i><strong>Warning:</strong> This group will be managed by Disc
</div>
<script>
$(function () {
var dialog;
var dialogGroupId;
var dialogFilterDate;
var dialogTitle;
let dialog;
let dialogGroupId;
let dialogFilterDate;
let dialogTitle;
function showDialog(groupId, filterDateOption, filterDateValue, updateUrl, title) {
if (dialog == null) {