diff --git a/AppData/AppData.csproj b/AppData/AppData.csproj
index d8539f3..f48a39b 100644
--- a/AppData/AppData.csproj
+++ b/AppData/AppData.csproj
@@ -255,8 +255,6 @@
DS_Report.xsd
-
-
SettingsSingleFileGenerator
@@ -276,10 +274,6 @@
-
-
-
-
diff --git a/NKC_WF/NKC_WF.csproj b/NKC_WF/NKC_WF.csproj
index b1f45ab..c6b7f41 100644
--- a/NKC_WF/NKC_WF.csproj
+++ b/NKC_WF/NKC_WF.csproj
@@ -310,8 +310,6 @@
-
-
Always
@@ -346,8 +344,6 @@
-
-
@@ -478,8 +474,6 @@
-
-
diff --git a/NKC_WF/Web.config b/NKC_WF/Web.config
index a437996..95c053b 100644
--- a/NKC_WF/Web.config
+++ b/NKC_WF/Web.config
@@ -27,7 +27,8 @@
-
+
@@ -58,6 +59,7 @@
+
@@ -85,13 +87,19 @@
-
-
-
+
+
+
-
-
+
+
@@ -400,7 +408,9 @@
-
+
@@ -410,7 +420,8 @@
-
+
@@ -459,8 +470,11 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/NKC_WF/WebUserControls/mod_lemmiVocab.ascx.cs b/NKC_WF/WebUserControls/mod_lemmiVocab.ascx.cs
index 3b2f2d4..8c23aaf 100644
--- a/NKC_WF/WebUserControls/mod_lemmiVocab.ascx.cs
+++ b/NKC_WF/WebUserControls/mod_lemmiVocab.ascx.cs
@@ -2,12 +2,11 @@ using SteamWare;
using System;
using System.Web.UI.WebControls;
-
namespace NKC_WF.WebUserControls
{
public partial class mod_lemmiVocab : ApplicationUserControl
{
- #region protected
+ #region Protected Methods
protected override void aggiornaControlliDataGL()
{
@@ -20,7 +19,7 @@ namespace NKC_WF.WebUserControls
if (grView.Rows.Count > 0)
{
LinkButton lb;
- // aggiorno gli headers
+ // aggiorno gli headers
foreach (TableCell cella in grView.HeaderRow.Cells)
{
try
@@ -39,6 +38,17 @@ namespace NKC_WF.WebUserControls
lblNumRec.Text = "";
}
}
+
+ protected override void Page_Load(object sender, EventArgs e)
+ {
+ base.Page_Load(sender, e);
+ _righeDataGridAnagr = 20;
+ }
+
+ #endregion Protected Methods
+
+ #region Public Methods
+
///
/// aggiorna i dati mostrati
///
@@ -48,6 +58,6 @@ namespace NKC_WF.WebUserControls
grView.DataBind();
}
- #endregion
+ #endregion Public Methods
}
}
\ No newline at end of file
diff --git a/gitSpread.bat b/gitSpread.bat
index 595cde4..7bcf011 100644
--- a/gitSpread.bat
+++ b/gitSpread.bat
@@ -11,7 +11,7 @@ set baseBranch=%1
set pushRemote=%2
git push . %baseBranch%:develop
-git push . %baseBranch%:master
+REM git push . %baseBranch%:master
git push . %baseBranch%:SDK
git push . %baseBranch%:report
git push . %baseBranch%:stable
@@ -20,7 +20,7 @@ REM Faccio push remoto condizionale
if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:%baseBranch% )
if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:develop )
if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:SDK )
-if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:master )
+REM if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:master )
if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:stable )
if %pushRemote% GTR 2 ( git push gitlab.steamware %baseBranch%:report )