Menu
▾
▴
[H2-commits] r1472 - in humano2/trunk: components/viewTools web/builder web/builder/site
|
From: <sv...@de...> - 2005-07-14 21:17:00
|
Author: marcelo
Date: 2005-07-14 17:16:38 -0400 (Thu, 14 Jul 2005)
New Revision: 1472
Modified:
humano2/trunk/components/viewTools/ViewTools.cs
humano2/trunk/web/builder/Builder.csproj
humano2/trunk/web/builder/site/domainmain.aspx
humano2/trunk/web/builder/site/domainmain.aspx.cs
humano2/trunk/web/builder/site/userdelete.aspx
humano2/trunk/web/builder/site/userdelete.aspx.cs
humano2/trunk/web/builder/site/usermain.aspx
humano2/trunk/web/builder/site/usermain.aspx.cs
Log:
* Fixed tickets #240, #239, #238
Modified: humano2/trunk/components/viewTools/ViewTools.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/components/viewTools/ViewTools.cs 2005-07-14 20:25:54 U=
TC (rev 1471)
+++ humano2/trunk/components/viewTools/ViewTools.cs 2005-07-14 21:16:38 U=
TC (rev 1472)
@@ -357,6 +357,12 @@
=09
public object GetSQLScalar(DataTable parametros)
{
+ while (parametros.Columns.Count < 6)
+ {
+ DataColumn dc =3D new DataColumn("filler " + parametros.Columns.Coun=
t,typeof(string));
+ parametros.Columns.Add(dc);
+ }
+
string sql =3D ParseQuery(parametros);
object resp =3D Complex.doScalar(sql);
=20
Modified: humano2/trunk/web/builder/Builder.csproj
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/Builder.csproj 2005-07-14 20:25:54 UTC (rev=
1471)
+++ humano2/trunk/web/builder/Builder.csproj 2005-07-14 21:16:38 UTC (rev=
1472)
@@ -547,6 +547,16 @@
BuildAction =3D "Compile"
/>
<File
+ RelPath =3D "site\userdelete.aspx"
+ BuildAction =3D "Content"
+ />
+ <File
+ RelPath =3D "site\userdelete.aspx.cs"
+ DependentUpon =3D "userdelete.aspx"
+ SubType =3D "ASPXCodeBehind"
+ BuildAction =3D "Compile"
+ />
+ <File
RelPath =3D "site\useredit.aspx"
BuildAction =3D "Content"
/>
@@ -583,6 +593,11 @@
BuildAction =3D "Compile"
/>
<File
+ RelPath =3D "site\usermain.aspx.resx"
+ DependentUpon =3D "usermain.aspx.cs"
+ BuildAction =3D "EmbeddedResource"
+ />
+ <File
RelPath =3D "site\useroperationbar.aspx"
BuildAction =3D "Content"
/>
Modified: humano2/trunk/web/builder/site/domainmain.aspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/domainmain.aspx 2005-07-14 20:25:54 UT=
C (rev 1471)
+++ humano2/trunk/web/builder/site/domainmain.aspx 2005-07-14 21:16:38 UT=
C (rev 1472)
@@ -7,7 +7,7 @@
<script language=3D"javascript">
function DeleteDomain(domainId) {
if(confirm("Are you sure you want to delete this domain?")) {
- window.location.href =3D "domaindelete.aspx?domainId=3D" + domainId=
;
+ window.location.href =3D "userdelete.aspx?returnTo=3Ddomainmain.asp=
x&entityID=3D" + domainId;
}
}
</script>
Modified: humano2/trunk/web/builder/site/domainmain.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/domainmain.aspx.cs 2005-07-14 20:25:54=
UTC (rev 1471)
+++ humano2/trunk/web/builder/site/domainmain.aspx.cs 2005-07-14 21:16:38=
UTC (rev 1472)
@@ -57,16 +57,27 @@
foreach(DataRow row in list.Rows) {
int domainId =3D Convert.ToInt32(row["id_entity"]);
string domainName =3D Convert.ToString(row["domainName"]);
- DomainList.Text +=3D "<li><a href=3D\"domainedit.aspx?domainId=3D"+ =
domainId +"\">"+domainName+"</a> ";
- if(domainId !=3D 10)=20
+ if (userCred.DomainIds[userCred.CurrentDomainIndex] =3D=3D domainId =
|| userCred.UserId =3D=3D 11)=20
{
- DomainList.Text +=3D "(<a href=3D\"#\" onClick=3D\"DeleteDomain("+d=
omainId+")\">Delete</a>)";
- }=20
- else=20
+ DomainList.Text +=3D "<li><a href=3D\"domainedit.aspx?domainId=3D"+=
domainId +"\">"+domainName+"</a> ";
+ }
+ else
{
- DomainList.Text +=3D "(Not Deletable)";
+ DomainList.Text +=3D "<li>"+domainName;
}
=20
+ if (userCred.DomainIds[userCred.CurrentDomainIndex] =3D=3D 10)
+ {
+ if(domainId !=3D 10)=20
+ {
+ DomainList.Text +=3D "(<a href=3D\"#\" onClick=3D\"DeleteDomain("+=
domainId+")\">Delete</a>)";
+ }=20
+ else=20
+ {
+ DomainList.Text +=3D "(Not Deletable)";
+ }
+ }
+
DomainList.Text +=3D "</li>";
}
}
Modified: humano2/trunk/web/builder/site/userdelete.aspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/userdelete.aspx 2005-07-14 20:25:54 UT=
C (rev 1471)
+++ humano2/trunk/web/builder/site/userdelete.aspx 2005-07-14 21:16:38 UT=
C (rev 1472)
@@ -1 +1 @@
-<%@ Page language=3D"c#" Codebehind=3D"dataclasscreate.aspx.cs" AutoEven=
tWireup=3D"false" Inherits=3D"Builder.site.UserDelete" %>
\ No newline at end of file
+<%@ Page language=3D"c#" Codebehind=3D"userdelete.aspx.cs" AutoEventWire=
up=3D"false" Inherits=3D"Builder.site.UserDelete" %>
\ No newline at end of file
Modified: humano2/trunk/web/builder/site/userdelete.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/userdelete.aspx.cs 2005-07-14 20:25:54=
UTC (rev 1471)
+++ humano2/trunk/web/builder/site/userdelete.aspx.cs 2005-07-14 21:16:38=
UTC (rev 1472)
@@ -45,12 +45,14 @@
=09
private void Page_Load(object sender, System.EventArgs e)
{
- int userId =3D Convert.ToInt32(Request.QueryString["userId"]);=09
+ int userId =3D Convert.ToInt32(Request.QueryString["entityID"]);
+ string returnTo =3D Request.QueryString["returnTo"];
+
adapter dbAdapter =3D new adapter();
Logger.Log("Deleting User : " + userId, LogLevel.Trace);
dbAdapter.DeleteInstance(userId, userCred);
Logger.Log("Deleting User Done", LogLevel.Trace);
- Response.Redirect(Html.genAbsoluteUrl("/builder/site/usermain.aspx"))=
;=09
+ Response.Redirect(Html.genAbsoluteUrl("/builder/site/" + returnTo));=09
} =09
}
}
Modified: humano2/trunk/web/builder/site/usermain.aspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/usermain.aspx 2005-07-14 20:25:54 UTC =
(rev 1471)
+++ humano2/trunk/web/builder/site/usermain.aspx 2005-07-14 21:16:38 UTC =
(rev 1472)
@@ -7,7 +7,7 @@
<script language=3D"javascript">
function DeleteUser(userId) {
if(confirm("Are you sure you want to remove this user?")) {
- window.location.href =3D "userdelete.aspx?userId=3D" + userId;
+ window.location.href =3D "userdelete.aspx?returnTo=3Dusermain.aspx&=
entityID=3D" + userId;
}
}
</script>
Modified: humano2/trunk/web/builder/site/usermain.aspx.cs
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- humano2/trunk/web/builder/site/usermain.aspx.cs 2005-07-14 20:25:54 U=
TC (rev 1471)
+++ humano2/trunk/web/builder/site/usermain.aspx.cs 2005-07-14 21:16:38 U=
TC (rev 1472)
@@ -58,7 +58,20 @@
foreach(DataRow row in list.Rows) {
int userId =3D Convert.ToInt32(row["id_entity"]);
string userName =3D Convert.ToString(row["email"]);
- UserList.Text +=3D "<li><a href=3D\"useredit.aspx?userId=3D"+ userId=
+"\">"+userName+"</a> (<a href=3D\"#\" onClick=3D\"DeleteUser("+userId+")=
\">Delete</a>)</li>";
+
+ if (userCred.UserId =3D=3D userId || userCred.UserId =3D=3D 11)=20
+ {
+ UserList.Text +=3D "<li><a href=3D\"useredit.aspx?userId=3D"+ userI=
d+"\">"+userName+"</a>";
+ }
+ else
+ {
+ UserList.Text +=3D "<li>"+userName+"</li>";
+ }
+ =09
+ if(userCred.DomainIds[userCred.CurrentDomainIndex] =3D=3D 10)=20
+ {
+ UserList.Text +=3D "(<a href=3D\"#\" onClick=3D\"DeleteUser("+userI=
d+")\">Delete</a>)</li>";
+ }
}
}
=09
|
