removed shortcuts from antville. support of shortcut is now optional via zip module
This commit is contained in:
parent
1028d1e78d
commit
b458c2cab1
6 changed files with 1 additions and 91 deletions
|
@ -314,22 +314,6 @@ function input_macro(param) {
|
|||
}
|
||||
|
||||
|
||||
/**
|
||||
* function renders a shortcut
|
||||
*/
|
||||
function shortcut_macro(param) {
|
||||
// disable caching of any contentPart containing this macro
|
||||
req.data.cachePart = false;
|
||||
if (param && param.name) {
|
||||
var sc = res.handlers.site.shortcuts.get(param.name);
|
||||
if (sc)
|
||||
sc.renderContent(param.text);
|
||||
else
|
||||
return(param.name);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* function renders a list of stories either contained
|
||||
* in a topic or from the story collection.
|
||||
|
|
|
@ -68,7 +68,6 @@ skins = mountpoint (skinmgr)
|
|||
files = mountpoint (filemgr)
|
||||
stories = mountpoint (storymgr)
|
||||
polls = mountpoint (pollmgr)
|
||||
shortcuts = mountpoint (shortcutmgr)
|
||||
|
||||
# collections
|
||||
allstories = collection (story)
|
||||
|
|
|
@ -179,7 +179,7 @@ function getRenderedContentPart (name) {
|
|||
var partLastRendered = this.cache["lastRendered_"+name];
|
||||
if (partLastRendered <= this.modifytime ||
|
||||
partLastRendered <= this.cache.modifytime) {
|
||||
// enable caching; some macros (eg. poll, shortcut, storylist)
|
||||
// enable caching; some macros (eg. poll, storylist)
|
||||
// will set this to false to prevent caching of a contentpart
|
||||
// containing them [rg]
|
||||
req.data.cachePart = true;
|
||||
|
|
|
@ -359,26 +359,3 @@ CREATE INDEX IDX_SITE_ISBLOCKED ON AV_SITE (SITE_ISBLOCKED);
|
|||
CREATE INDEX IDX_SITE_ENABLEPING ON AV_SITE (SITE_ENABLEPING);
|
||||
CREATE INDEX IDX_SITE_LASTPING ON AV_SITE (SITE_LASTPING);
|
||||
CREATE INDEX IDX_SITE_F_USER_CREATOR ON AV_SITE (SITE_F_USER_CREATOR);
|
||||
|
||||
#----------------------------
|
||||
# Table structure for AV_SHORTCUT
|
||||
#----------------------------
|
||||
|
||||
create table AV_SHORTCUT (
|
||||
SHORTCUT_ID int(10) not null,
|
||||
SHORTCUT_F_SITE int(10),
|
||||
SHORTCUT_F_USER_CREATOR int(10),
|
||||
SHORTCUT_TITLE varchar(255),
|
||||
SHORTCUT_CONTENT text,
|
||||
SHORTCUT_CREATETIME timestamp,
|
||||
SHORTCUT_MODIFYTIME timestamp,
|
||||
primary key (SHORTCUT_ID)
|
||||
);
|
||||
|
||||
#----------------------------
|
||||
# Indexes on table AV_SHORTCUT
|
||||
#----------------------------
|
||||
|
||||
CREATE INDEX IDX_SHORTCUT_SITE ON AV_SHORTCUT (SHORTCUT_F_SITE);
|
||||
CREATE INDEX IDX_SHORTCUT_CREATOR ON AV_SHORTCUT (SHORTCUT_F_USER_CREATOR);
|
||||
CREATE INDEX IDX_SHORTCUT_TITLE ON AV_SHORTCUT (SHORTCUT_TITLE);
|
||||
|
|
|
@ -370,26 +370,3 @@ CREATE INDEX IDX_SITE_ISBLOCKED ON AV_SITE (SITE_ISBLOCKED);
|
|||
CREATE INDEX IDX_SITE_ENABLEPING ON AV_SITE (SITE_ENABLEPING);
|
||||
CREATE INDEX IDX_SITE_LASTPING ON AV_SITE (SITE_LASTPING);
|
||||
CREATE INDEX IDX_SITE_F_USER_CREATOR ON AV_SITE (SITE_F_USER_CREATOR);
|
||||
|
||||
#----------------------------
|
||||
# Table structure for AV_SHORTCUT
|
||||
#----------------------------
|
||||
|
||||
create table AV_SHORTCUT (
|
||||
SHORTCUT_ID mediumint(9) not null,
|
||||
SHORTCUT_F_SITE mediumint(9) null,
|
||||
SHORTCUT_F_USER_CREATOR mediumint(9) null,
|
||||
SHORTCUT_TITLE varchar(255) null,
|
||||
SHORTCUT_CONTENT mediumtext null,
|
||||
SHORTCUT_CREATETIME datetime null,
|
||||
SHORTCUT_MODIFYTIME datetime null,
|
||||
primary key (SHORTCUT_ID)
|
||||
);
|
||||
|
||||
#----------------------------
|
||||
# Indexes on table AV_SHORTCUT
|
||||
#----------------------------
|
||||
|
||||
CREATE INDEX IDX_SHORTCUT_SITE ON AV_SHORTCUT (SHORTCUT_F_SITE);
|
||||
CREATE INDEX IDX_SHORTCUT_CREATOR ON AV_SHORTCUT (SHORTCUT_F_USER_CREATOR);
|
||||
CREATE INDEX IDX_SHORTCUT_TITLE ON AV_SHORTCUT (SHORTCUT_TITLE);
|
||||
|
|
|
@ -434,33 +434,6 @@ CREATE INDEX "ANTVILLE"."IDX_SITE_ENABLEPING" ON "ANTVILLE"."AV_SITE"("SITE_ENAB
|
|||
CREATE INDEX "ANTVILLE"."IDX_SITE_LASTPING" ON "ANTVILLE"."AV_SITE"("SITE_LASTPING") TABLESPACE "ANTVILLE_IDX";
|
||||
CREATE INDEX "ANTVILLE"."IDX_SITE_F_USER_CREATOR" ON "ANTVILLE"."AV_SITE"("SITE_F_USER_CREATOR") TABLESPACE "ANTVILLE_IDX";
|
||||
|
||||
------------------------------
|
||||
-- Table structure for SHORTCUT
|
||||
------------------------------
|
||||
|
||||
CREATE TABLE "ANTVILLE"."AV_SHORTCUT"
|
||||
( "SHORTCUT_ID" NUMBER(10) NOT NULL,
|
||||
"SHORTCUT_F_SITE" NUMBER(10),
|
||||
"SHORTCUT_F_USER_CREATOR" NUMBER(10),
|
||||
"SHORTCUT_TITLE" VARCHAR(255),
|
||||
"SHORTCUT_CONTENT" VARCHAR2(4000),
|
||||
"SHORTCUT_CREATETIME" DATE,
|
||||
"SHORTCUT_MODIFYTIME" DATE,
|
||||
PRIMARY KEY("SHORTCUT_ID")
|
||||
USING INDEX
|
||||
TABLESPACE "ANTVILLE_IDX"
|
||||
)
|
||||
TABLESPACE "ANTVILLE";
|
||||
|
||||
------------------------------
|
||||
-- Indexes on table SHORTCUT
|
||||
------------------------------
|
||||
|
||||
CREATE INDEX "ANTVILLE"."IDX_SHORTCUT_SITE" ON "ANTVILLE"."AV_SHORTCUT"("SHORTCUT_F_SITE") TABLESPACE "ANTVILLE_IDX";
|
||||
CREATE INDEX "ANTVILLE"."IDX_SHORTCUT_CREATOR" ON "ANTVILLE"."AV_SHORTCUT"("SHORTCUT_F_USER_CREATOR") TABLESPACE "ANTVILLE_IDX";
|
||||
CREATE INDEX "ANTVILLE"."IDX_SHORTCUT_TITLE" ON "ANTVILLE"."AV_SHORTCUT"("SHORTCUT_TITLE") TABLESPACE "ANTVILLE_IDX";
|
||||
|
||||
|
||||
--------------------------------
|
||||
-- Oracle-specific workaround to
|
||||
-- simulate auto_increment
|
||||
|
|
Loading…
Add table
Reference in a new issue