admin/ayanova7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

case 3646

Browse Source
This commit is contained in:
John Cardinal
2018-08-22 21:59:07 +00:00
parent c3cb344ddf
commit afb22dd266
5 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/WBI/ReportView.aspx.cs
View File

@@ -75,11 +75,11 @@ public partial class ReportView : BaseThemePage
//case 3646 removed
if (AyaBizUtils.Trial) //if (AyaBizUtils.Trial)
{ //{
WatermarkReport(x, true); // WatermarkReport(x, true);
} //}
//pass it to the viewer component //pass it to the viewer component
this.ReportViewer1.Report = x; this.ReportViewer1.Report = x;

22
source/WinFormApp/Form1.cs
View File

@@ -2711,17 +2711,19 @@ namespace AyaNova
sub.SharedProps.Visible = !bHideSub; sub.SharedProps.Visible = !bHideSub;
Infragistics.Win.UltraWinToolbars.PopupMenuTool tbHelp = (Infragistics.Win.UltraWinToolbars.PopupMenuTool)ultraToolbarsManager1.Toolbars["LT:UI.Toolbar.MainMenuBar"].Tools["LT:UI.Menu.Help"]; Infragistics.Win.UltraWinToolbars.PopupMenuTool tbHelp = (Infragistics.Win.UltraWinToolbars.PopupMenuTool)ultraToolbarsManager1.Toolbars["LT:UI.Toolbar.MainMenuBar"].Tools["LT:UI.Menu.Help"];
//case 1356
if ((AyaBizUtils.RequestedTrial || AyaBizUtils.Trial) && AyaBizUtils.AyaNovaConnectionSetting.SingleUserConnection)
{
tbHelp.Tools["LITE"].SharedProps.Visible = true;
if (AyaBizUtils.Lite)
tbHelp.Tools["LITE"].SharedProps.Caption = "Trial: Switch to regular AyaNova";
else
tbHelp.Tools["LITE"].SharedProps.Caption = "Trial: Switch to AyaNova Lite";
} //case 3646 removed
else ////case 1356
//if ((AyaBizUtils.RequestedTrial || AyaBizUtils.Trial) && AyaBizUtils.AyaNovaConnectionSetting.SingleUserConnection)
//{
// tbHelp.Tools["LITE"].SharedProps.Visible = true;
// if (AyaBizUtils.Lite)
// tbHelp.Tools["LITE"].SharedProps.Caption = "Trial: Switch to regular AyaNova";
// else
// tbHelp.Tools["LITE"].SharedProps.Caption = "Trial: Switch to AyaNova Lite";
//}
//else
tbHelp.Tools["LITE"].SharedProps.Visible = false; tbHelp.Tools["LITE"].SharedProps.Visible = false;
//case 1306 //case 1306

6
source/WinFormApp/GlobalxForm.cs
View File

@@ -208,8 +208,10 @@ namespace AyaNova
case "LT:Admin.Label.EraseDatabase": // ButtonTool case "LT:Admin.Label.EraseDatabase": // ButtonTool
if (AyaBizUtils.Trial) if (AyaBizUtils.Trial)
{ {
MessageBox.Show("This feature requires a license.\r\nTrial databases can not be erased."); //case 3646 changed this block
return; MessageBox.Show("Erasing a trial database can make it harder to evaluate AyaNova.\r\nPlease be sure you are familiar with AyaNova first.");
//MessageBox.Show("This feature requires a license.\r\nTrial databases can not be erased.");
//return;
} }
if (!AyaBizUtils.Lite && !User.IsAdmin) if (!AyaBizUtils.Lite && !User.IsAdmin)
{ {

3
source/bizobjects/AyaLib/GZTW.AyaNova.BLL/ReportGenerator.cs
View File

@@ -57,7 +57,8 @@ namespace GZTW.AyaNova.BLL
} }
} }
if (AyaBizUtils.Trial) WatermarkReport(x); //case 3646 removed
// if (AyaBizUtils.Trial) WatermarkReport(x);
MemoryStream ms = new MemoryStream(); MemoryStream ms = new MemoryStream();
x.ExportToPdf(ms); x.ExportToPdf(ms);

16
source/bizobjects/AyaLib/GZTW.AyaNova.BLL/Workorder.cs
View File

@@ -3020,14 +3020,16 @@ namespace GZTW.AyaNova.BLL
if(AyaBizUtils.IsGenerator || c.mRights > SecurityLevelTypes.ReadOnly) if(AyaBizUtils.IsGenerator || c.mRights > SecurityLevelTypes.ReadOnly)
{ {
//Count the workorders if it's a trial, sb no more than 30
if(AyaBizUtils.Trial)
{
if(WorkorderCountFetcher.GetItem()>29)
throw new TrialException(LocalizedTextTable.GetLocalizedTextDirect("Error.Trial.Restricted"));
} //case 3646 removed this block
////Count the workorders if it's a trial, sb no more than 30
//if(AyaBizUtils.Trial)
//{
// if(WorkorderCountFetcher.GetItem()>29)
// throw new TrialException(LocalizedTextTable.GetLocalizedTextDirect("Error.Trial.Restricted"));
//}
//c = new Workorder(); //c = new Workorder();
c.WorkorderType=WorkorderType; c.WorkorderType=WorkorderType;