Menu
▾
▴
[H2-commits] r1206 - in humano2/trunk/web/builder/site: . js
|
From: <sv...@de...> - 2005-05-30 21:18:19
|
Author: svera
Date: 2005-05-30 17:18:10 -0400 (Mon, 30 May 2005)
New Revision: 1206
Modified:
humano2/trunk/web/builder/site/buildattribute.aspx
humano2/trunk/web/builder/site/buildattribute.aspx.cs
humano2/trunk/web/builder/site/js/tabs.js
Log:
Fix: Problem with create Attribute.
* In buildattribute.aspx, when you have created the atributte name and t=
hen choose pertinence class, you loose the attribute. This is now fixed.
Modified: humano2/trunk/web/builder/site/buildattribute.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/buildattribute.aspx 2005-05-30 20:49:3=
7 UTC (rev 1205)
+++ humano2/trunk/web/builder/site/buildattribute.aspx 2005-05-30 21:18:1=
0 UTC (rev 1206)
@@ -41,13 +41,13 @@
function reloadPermClass(classId) {
var start =3D String(document.location).indexOf('&pertClassId');
if(start =3D=3D -1) {
- document.location=3D document.location+'&pertClassId=3D' + classId;
+ document.location=3D document.location+'&pertClassId=3D' + classId +=
"&tmpAttName=3D" + tmpAttName;
} else {
var loc =3D String(document.location).substring(0, start);=20
- document.location=3D loc+'&pertClassId=3D' + classId;
+ document.location=3D loc+'&pertClassId=3D' + classId + "&tmpAttName=3D=
" + tmpAttName;
}
}
-
+ tmpAttName =3D "<% html_getTmpAttName(); %>";
</script>
</HEAD>
<body onLoad=3D"SetModelState('EditAttribute')">
@@ -56,4 +56,4 @@
<INPUT id=3D"classId" type=3D"hidden" name=3D"hidClassId" runat=3D"se=
rver">
</form>
</body>
-</HTML>
+</HTML>
\ No newline at end of file
Modified: humano2/trunk/web/builder/site/buildattribute.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/buildattribute.aspx.cs 2005-05-30 20:4=
9:37 UTC (rev 1205)
+++ humano2/trunk/web/builder/site/buildattribute.aspx.cs 2005-05-30 21:1=
8:10 UTC (rev 1206)
@@ -42,6 +42,7 @@
=20
private bool isNewAttribute =3D true;
private string selectedVisibleTabName;
+ private string tmpAttName =3D "";
=20
override protected void OnInit(EventArgs e)
{
@@ -63,8 +64,10 @@
int typeId;
int classId;
=09
+ =20
classId =3D Convert.ToInt32(Request.QueryString["classId"].ToString()=
);
attrId =3D Convert.ToInt32(Request.QueryString["attrId"].ToString());
+ tmpAttName =3D Request.QueryString["tmpAttName"];
if(attrId =3D=3D 0) {
this.isNewAttribute =3D true;
typeId =3D Convert.ToInt32(Request.QueryString["typeId"].ToString()=
);
@@ -1187,6 +1190,14 @@
}
return null;
}
+ =20
+ public void html_getTmpAttName()
+ {
+ if(tmpAttName !=3D null)
+ {
+ Response.Write(tmpAttName);
+ }
+ }
=20
}
-}
+}
\ No newline at end of file
Modified: humano2/trunk/web/builder/site/js/tabs.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=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/js/tabs.js 2005-05-30 20:49:37 UTC (re=
v 1205)
+++ humano2/trunk/web/builder/site/js/tabs.js 2005-05-30 21:18:10 UTC (re=
v 1206)
@@ -1,21 +1,26 @@
-/*
-// The Humano2 Business solution.
-// Copyright (C) 1999,3 Convea Ltd.
-// Copyright (C) 2004,5 Humano2 Chile S.A. (http://www.humano2.com)
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version. =20
-//
-// $Id$
-*/
-=09
+/*
+// The Humano2 Business solution.
+// Copyright (C) 1999,3 Convea Ltd.
+// Copyright (C) 2004,5 Humano2 Chile S.A. (http://www.humano2.com)
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version. =20
+//
+// $Id$
+*/
+=09
/* Interchange Tabs on the same page */
+ var tmpAttName =3D "";
function TabChange(tabID, wantcookie, numtabs, newwinheight)=20
{=09
var tab0=3Dnull; var tab1=3Dnull; var tab2=3Dnull; var tab3=3Dnull; =
var tab4=3Dnull;var tab5=3Dnull;var tab6=3Dnull;
- =09
+ if (document.Form1.attName.value !=3D "")
+ {
+ tmpAttName =3D document.Form1.attName.value;
+ }
+ =20
if(newwinheight)
{
frameWidth =3D document.body.clientWidth+6;
@@ -31,9 +36,9 @@
if(numtabs>4)tab4 =3D document.getElementById('TabE').style;
if(numtabs>5)tab5 =3D document.getElementById('TabF').style;
if(numtabs>6)tab6 =3D document.getElementById('TabG').style;
-=09
if (tabID =3D=3D 1)=20
{
+ if (tmpAttName !=3D ""){document.Form1.attName.value =3D tmp=
AttName; }
if(wantcookie) SetCookie ("ViewTab", "A");
tab0.visibility =3D "visible";=20
tab1.visibility =3D "hidden";=20
@@ -119,116 +124,116 @@
=09
return;
}
-=09
- /* Switch between tabs that are on a secondary level. */
- function TabChange2(tabID, wantcookie, numtabs, newwinheight)=20
- {=09
- var tab0=3Dnull; var tab1=3Dnull; var tab2=3Dnull; var tab3=3Dnull; =
var tab4=3Dnull;var tab5=3Dnull;var tab6=3Dnull;
- =09
- if(newwinheight)
- {
- frameWidth =3D document.body.clientWidth+6;
- frameHeight =3D document.body.clientHeight; =09
- window.resizeTo(frameWidth, newwinheight);
- }
-=09
-
- tab0 =3D document.getElementById('TabAA').style;
- tab1 =3D document.getElementById('TabBB').style;
- if(numtabs>2)tab2 =3D document.getElementById('TabCC').style;
- if(numtabs>3)tab3 =3D document.getElementById('TabDD').style;
- if(numtabs>4)tab4 =3D document.getElementById('TabEE').style;
- if(numtabs>5)tab5 =3D document.getElementById('TabFF').style;
- if(numtabs>6)tab6 =3D document.getElementById('TabGG').style;
-=09
- if (tabID =3D=3D 1)=20
- {
- if(wantcookie) SetCookie ("ViewTab", "AA");
- tab0.visibility =3D "visible";=20
- tab1.visibility =3D "hidden";=20
- if(tab2){tab2.visibility =3D "hidden"; }
- if(tab3){tab3.visibility =3D "hidden"; }
- if(tab4){tab4.visibility =3D "hidden"; }
- if(tab5){tab5.visibility =3D "hidden"; }
- if(tab6){tab6.visibility =3D "hidden"; }
- }
-
- if (tabID =3D=3D 2)=20
- {
- if(wantcookie) SetCookie ("ViewTab", "BB");
- tab0.visibility =3D "hidden";=09
- tab1.visibility =3D "visible";=20
- if(tab2){tab2.visibility =3D "hidden"; }
- if(tab3){tab3.visibility =3D "hidden"; }
- if(tab4){tab4.visibility =3D "hidden"; }
- if(tab5){tab5.visibility =3D "hidden"; }
- if(tab6){tab6.visibility =3D "hidden"; }
- }
-
- if (tabID =3D=3D 3)=20
- {
- if(wantcookie) SetCookie ("ViewTab", "CC");
- tab0.visibility =3D "hidden";
- tab1.visibility =3D "hidden";=09
- if(tab2){tab2.visibility =3D "visible"; }
- if(tab3){tab3.visibility =3D "hidden"; }
- if(tab4){tab4.visibility =3D "hidden"; }
- if(tab5){tab5.visibility =3D "hidden"; }
- if(tab6){tab6.visibility =3D "hidden"; }
- }
-
- if (tabID =3D=3D 4)=20
- {
- if(wantcookie) SetCookie ("ViewTab", "DD");
- tab0.visibility =3D "hidden";=09
- tab1.visibility =3D "hidden";
- if(tab2){tab2.visibility =3D "hidden"; }
- if(tab3){tab3.visibility =3D "visible"; }
- if(tab4){tab4.visibility =3D "hidden"; }
- if(tab5){tab5.visibility =3D "hidden"; }
- if(tab6){tab6.visibility =3D "hidden"; }
- }
- =09
- if (tabID =3D=3D 5)=20
- {
- if(wantcookie) SetCookie ("ViewTab", "EE");
- tab0.visibility =3D "hidden";
- tab1.visibility =3D "hidden";
- if(tab2){tab2.visibility =3D "hidden"; }
- if(tab3){tab3.visibility =3D "hidden"; }
- if(tab4){tab4.visibility =3D "visible"; }
- if(tab5){tab5.visibility =3D "hidden"; }
- if(tab6){tab6.visibility =3D "hidden"; }
- }
- =09
- if (tabID =3D=3D 6)=20
- {
- if(wantcookie) SetCookie ("ViewTab", "FF");
- tab0.visibility =3D "hidden";
- tab1.visibility =3D "hidden";
- if(tab2){tab2.visibility =3D "hidden"; }
- if(tab3){tab3.visibility =3D "hidden"; }
- if(tab4){tab4.visibility =3D "hidden"; }
- if(tab5){tab5.visibility =3D "visible"; }
- if(tab6){tab6.visibility =3D "hidden"; }
- }
-
- if (tabID =3D=3D 7)=20
- {
- if(wantcookie) SetCookie ("ViewTab", "GG");
- tab0.visibility =3D "hidden";
- tab1.visibility =3D "hidden";
- if(tab2){tab2.visibility =3D "hidden"; }
- if(tab3){tab3.visibility =3D "hidden"; }
- if(tab4){tab4.visibility =3D "hidden"; }
- if(tab5){tab5.visibility =3D "hidden"; }
- if(tab6){tab6.visibility =3D "visible"; }
- }
- =09
- =09
- return;
- }
=09
+ /* Switch between tabs that are on a secondary level. */
+ function TabChange2(tabID, wantcookie, numtabs, newwinheight)=20
+ {=09
+ var tab0=3Dnull; var tab1=3Dnull; var tab2=3Dnull; var tab3=3Dnull; =
var tab4=3Dnull;var tab5=3Dnull;var tab6=3Dnull;
+ =09
+ if(newwinheight)
+ {
+ frameWidth =3D document.body.clientWidth+6;
+ frameHeight =3D document.body.clientHeight; =09
+ window.resizeTo(frameWidth, newwinheight);
+ }
+=09
+
+ tab0 =3D document.getElementById('TabAA').style;
+ tab1 =3D document.getElementById('TabBB').style;
+ if(numtabs>2)tab2 =3D document.getElementById('TabCC').style;
+ if(numtabs>3)tab3 =3D document.getElementById('TabDD').style;
+ if(numtabs>4)tab4 =3D document.getElementById('TabEE').style;
+ if(numtabs>5)tab5 =3D document.getElementById('TabFF').style;
+ if(numtabs>6)tab6 =3D document.getElementById('TabGG').style;
+=09
+ if (tabID =3D=3D 1)=20
+ {
+ if(wantcookie) SetCookie ("ViewTab", "AA");
+ tab0.visibility =3D "visible";=20
+ tab1.visibility =3D "hidden";=20
+ if(tab2){tab2.visibility =3D "hidden"; }
+ if(tab3){tab3.visibility =3D "hidden"; }
+ if(tab4){tab4.visibility =3D "hidden"; }
+ if(tab5){tab5.visibility =3D "hidden"; }
+ if(tab6){tab6.visibility =3D "hidden"; }
+ }
+
+ if (tabID =3D=3D 2)=20
+ {
+ if(wantcookie) SetCookie ("ViewTab", "BB");
+ tab0.visibility =3D "hidden";=09
+ tab1.visibility =3D "visible";=20
+ if(tab2){tab2.visibility =3D "hidden"; }
+ if(tab3){tab3.visibility =3D "hidden"; }
+ if(tab4){tab4.visibility =3D "hidden"; }
+ if(tab5){tab5.visibility =3D "hidden"; }
+ if(tab6){tab6.visibility =3D "hidden"; }
+ }
+
+ if (tabID =3D=3D 3)=20
+ {
+ if(wantcookie) SetCookie ("ViewTab", "CC");
+ tab0.visibility =3D "hidden";
+ tab1.visibility =3D "hidden";=09
+ if(tab2){tab2.visibility =3D "visible"; }
+ if(tab3){tab3.visibility =3D "hidden"; }
+ if(tab4){tab4.visibility =3D "hidden"; }
+ if(tab5){tab5.visibility =3D "hidden"; }
+ if(tab6){tab6.visibility =3D "hidden"; }
+ }
+
+ if (tabID =3D=3D 4)=20
+ {
+ if(wantcookie) SetCookie ("ViewTab", "DD");
+ tab0.visibility =3D "hidden";=09
+ tab1.visibility =3D "hidden";
+ if(tab2){tab2.visibility =3D "hidden"; }
+ if(tab3){tab3.visibility =3D "visible"; }
+ if(tab4){tab4.visibility =3D "hidden"; }
+ if(tab5){tab5.visibility =3D "hidden"; }
+ if(tab6){tab6.visibility =3D "hidden"; }
+ }
+ =09
+ if (tabID =3D=3D 5)=20
+ {
+ if(wantcookie) SetCookie ("ViewTab", "EE");
+ tab0.visibility =3D "hidden";
+ tab1.visibility =3D "hidden";
+ if(tab2){tab2.visibility =3D "hidden"; }
+ if(tab3){tab3.visibility =3D "hidden"; }
+ if(tab4){tab4.visibility =3D "visible"; }
+ if(tab5){tab5.visibility =3D "hidden"; }
+ if(tab6){tab6.visibility =3D "hidden"; }
+ }
+ =09
+ if (tabID =3D=3D 6)=20
+ {
+ if(wantcookie) SetCookie ("ViewTab", "FF");
+ tab0.visibility =3D "hidden";
+ tab1.visibility =3D "hidden";
+ if(tab2){tab2.visibility =3D "hidden"; }
+ if(tab3){tab3.visibility =3D "hidden"; }
+ if(tab4){tab4.visibility =3D "hidden"; }
+ if(tab5){tab5.visibility =3D "visible"; }
+ if(tab6){tab6.visibility =3D "hidden"; }
+ }
+
+ if (tabID =3D=3D 7)=20
+ {
+ if(wantcookie) SetCookie ("ViewTab", "GG");
+ tab0.visibility =3D "hidden";
+ tab1.visibility =3D "hidden";
+ if(tab2){tab2.visibility =3D "hidden"; }
+ if(tab3){tab3.visibility =3D "hidden"; }
+ if(tab4){tab4.visibility =3D "hidden"; }
+ if(tab5){tab5.visibility =3D "hidden"; }
+ if(tab6){tab6.visibility =3D "visible"; }
+ }
+ =09
+ =09
+ return;
+ }
+=09
function HideLayerMini(accion){
=09
if(!document.getElementById('TabAA'))
|
