FSN#24267 Links in XML op kunnen nemen

svn path=/Website/trunk/; revision=15586
This commit is contained in:
Peter Feij
2012-10-04 15:07:02 +00:00
parent a7784f70df
commit 88792de0f9
5 changed files with 25 additions and 10 deletions

View File

@@ -7,6 +7,7 @@
Description: Redirect naar een bookmark url
Parameters: u Bookmark die in de bookmark tabel moet zitten.
Dit moet de eerste parameter zijn als er nog meer komen
k Een integer keywaarde die plat achter de bookmark_query wordt geplakt
-- Optionele parameter(s): die worden allemaal blind
doorgegeven naar het volgende scherm
Context: Vanuit root
@@ -23,6 +24,7 @@
<!-- #include file="../Shared/common.inc"-->
<%
var u = getQParam("u");
var keyparam = getQParamInt("k", -1);
// For flexiblity reasons: Literal or runtime parameter(s), just pass through...
var rest = String(Request.ServerVariables("QUERY_STRING")); // Request.ServerVariables("QUERY_STRING") is url-encoded,
// dat is hier safer dan Request.QueryString
@@ -52,7 +54,16 @@
if (oRs("fac_bookmark_query").Value)
{
url += "?" + oRs("fac_bookmark_query").Value + (rest?"&"+rest:"");
if (keyparam > -1)
{
rest = rest.substring(("k="+keyparam).length+1);
url += "?" + oRs("fac_bookmark_query").Value + keyparam + (rest?"&"+rest:"");
}
else
{
url += "?" + oRs("fac_bookmark_query").Value + (rest?"&"+rest:"");
}
}
else
{

View File

@@ -4,8 +4,14 @@
$Id$
File: fac_bookmark_list.asp
Status:
Description: Toon alle bookmarks
Status: REVISEREN!
Hier staan UWVA-API-keys in en zeer specifieke functionaliteit
Eindsituatie moet een generiek beheer-UI voor bookmarks zijn
Die API-spullen moeten hier dan uit geisoleerd worden, of generiek.
Description: Toon alle bookmarks, behalve onze systeembookmarks (met xmlnode)
Parameters:
Context: Vanuit menu
*/
@@ -20,7 +26,7 @@ FCLTHeader.Requires({js: []});
var autfunction = "WEB_HLPADM";
var authparams = user.checkAutorisation(autfunction);
var showall = getQParamInt("showall", 0) == 1;
%>
<html>
@@ -102,6 +108,7 @@ var authparams = user.checkAutorisation(autfunction);
+ " FROM fac_bookmark"
+ " WHERE (fac_bookmark_expire IS NULL OR fac_bookmark_expire > SYSDATE)"
+ " AND (fac_bookmark_query NOT LIKE 'session=%' OR fac_bookmark_query IS NULL)"
+ " AND fac_bookmark_xmlnode IS NULL" // die zijn van ons zelf en worden niet geacht beheerd te worden.
+ " ORDER BY fac_bookmark_naam";
var rst = new ResultsetTable({ sql: sql,
@@ -110,13 +117,14 @@ var authparams = user.checkAutorisation(autfunction);
rowData: fnrowData,
noPrint: true,
title: L("lcl_fac_bookmarkitems"),
showAll: showall,
buttons: buttons
});
rst.addColumn(new Column({caption: L("lcl_fac_bookmark"), content:"fac_bookmark_naam"}));
rst.addColumn(new Column({caption: L("lcl_fac_bookmarkcreate"), content:"fac_bookmark_aanmaak", datatype: "datetime"}));
rst.addColumn(new Column({caption: L("lcl_fac_bookmarkpath"), content:"fac_bookmark_path"}));
rst.addColumn(new Column({caption: L("lcl_fac_bookmarkquery"), content:"fac_bookmark_query"}));
//rst.addColumn(new Column({caption: L("lcl_fac_bookmarkquery"), content:"fac_bookmark_query"}));
if (report_api) // dan is een deeplink mogelijk
rst.addColumn(new Column({caption: L("lcl_fac_bookmarkdeep"), content: fncolDeep}));

View File

@@ -68,7 +68,6 @@ if (api_key > 0)
import_app_key = oRs("fac_import_app_key").Value;
api_options_json = prettyJson(oRs("fac_api_options_json").Value);
api_xmlnode = oRs("fac_api_xmlnode").Value;
}
else
{
@@ -142,7 +141,6 @@ else
RWFIELDTR("fac_api_stylesheet", "fld", L("lcl_fac_api_stylesheet") , api_stylesheet, {maxlength: 64});
RWFIELDTR("fac_import_app_key", "fld", L("lcl_fac_import_app") , import_app_key);
RWTEXTAREATR("fac_api_options_json", "fldtxt", L("lcl_fac_api_options") , api_options_json, {maxlength: 4000});
RWFIELDTR("fac_api_xmlnode", "fld", L("lcl_fac_api_xmlnode") , api_xmlnode, {maxlength: 20});
BLOCK_END();
%>
</form>

View File

@@ -66,8 +66,7 @@ var fields = [ { dbs: "fac_api_name", typ: "varchar", frm: "fac_ap
{ dbs: "fac_api_stylesheet", typ: "varchar", frm: "fac_api_stylesheet"},
{ dbs: "fac_import_app_key", typ: "key", frm: "fac_import_app_key"},
{ dbs: "fac_api_options_json", typ: "varchar", val: viewoptions, len: 4000},
{ dbs: "fac_api_omschrijving", typ: "varchar", frm: "fac_api_omschrijving", len: 60},
{ dbs: "fac_api_xmlnode", typ: "varchar", frm: "fac_api_xmlnode"} ];
{ dbs: "fac_api_omschrijving", typ: "varchar", frm: "fac_api_omschrijving", len: 60}];
var warning = "";
if (api_key > 0)

View File

@@ -113,7 +113,6 @@ function prettyJson(j)
ROFIELDTR("fld", L("lcl_fac_api_stylesheet") , oRs("fac_api_stylesheet").Value);
ROFIELDTR("fld", L("lcl_fac_import_app") , oRs("fac_import_app_key").Value);
ROTEXTAREATR("fldtxt", L("lcl_fac_api_options") , prettyJson(oRs("fac_api_options_json").Value));
ROFIELDTR("fld", L("lcl_fac_api_xmlnode") , oRs("fac_api_xmlnode").Value);
BLOCK_END();
BLOCK_START("apiSample", L("lcl_fac_api")+" "+L("lcl_fac_api_sample"));