fixed tag association listing

luyi0521 · Apr 26, 2012 · 69f9f4b · 69f9f4b
1 parent cd64a98
commit 69f9f4b
Show file tree

Hide file tree

Showing 14 changed files with 431 additions and 438 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -15,7 +15,9 @@ I:updated jstree version
 DB UPGRADE 1.6 -> 1.7
 -----------------------------
 alter table settings add column timezone;
+alter table settings add column dbversion;
 update settings set timezone="GMT";
+update settings set dbversion=1;
 
 
 

diff --git a/data/pure.db b/data/pure.db
diff --git a/doc/aes/aes.html b/doc/aes/aes.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
 <head>
 <title>JavaScript Implementation of AES Advanced Encryption Standard in Counter Mode</title>

diff --git a/doc/sqlite-1.2.txt → doc/sqlite.txt b/doc/sqlite-1.2.txt → doc/sqlite.txt
@@ -17,12 +17,13 @@ CREATE TABLE item2file(itemid INTEGER,fileid INTEGER);
 CREATE TABLE "item2inv" (itemid integer,invid integer);
 CREATE TABLE item2soft (itemid INTEGER, softid INTEGER, instdate INTEGER);
 CREATE TABLE itemlink (itemid1, itemid2);
-CREATE TABLE items (id INTEGER primary key autoincrement,itemtypeid integer, function, manufacturerid integer,model,sn,sn2,sn3,origin,warrantymonths integer,purchasedate integer,purchprice,dnsname,maintenanceinfo,comments,ispart integer,hd,cpu,ram,locationid integer,userid integer,ipv4,ipv6,usize integer,rackmountable integer,macs,remadmip,panelport,ports integer,switchport,switchid integer,rackid integer,rackposition integer,label,status integer, cpuno INTEGER, corespercpu INTEGER, rackposdepth integer, warrinfo);
+CREATE TABLE items (id INTEGER primary key autoincrement,itemtypeid integer, function, manufacturerid integer,model,sn,sn2,sn3,origin,warrantymonths integer,purchasedate integer,purchprice,dnsname,maintenanceinfo,comments,ispart integer,hd,cpu,ram,locationid integer,userid integer,ipv4,ipv6,usize integer,rackmountable integer,macs,remadmip,panelport,ports integer,switchport,switchid integer,rackid integer,rackposition integer,label,status integer, cpuno INTEGER, corespercpu INTEGER, rackposdepth integer, warrinfo, locareaid number);
 CREATE TABLE itemtypes (id INTEGER PRIMARY KEY AUTOINCREMENT, typeid, typedesc, hassoftware integer);
-CREATE TABLE labelpapers (id INTEGER PRIMARY KEY AUTOINCREMENT,rows integer, cols integer, lwidth real, lheight real,  vpitch real,  hpitch real,  tmargin real,  bmargin real,  lmargin real,  rmargin real, name);
+CREATE TABLE labelpapers (id INTEGER PRIMARY KEY AUTOINCREMENT,rows integer, cols integer, lwidth real, lheight real,  vpitch real,  hpitch real,  tmargin real,  bmargin real,  lmargin real,  rmargin real, name, border, padding, headerfontsize, idfontsize, wantheadertext, wantheaderimage, headertext, fontsize, wantbarcode, barcodesize, image, imagewidth, imageheight, papersize);
 CREATE TABLE locareas(id  INTEGER PRIMARY KEY AUTOINCREMENT,locationid number,areaname,x1 number,y1 number,x2 number,y2 number);
 CREATE TABLE locations (id INTEGER PRIMARY KEY AUTOINCREMENT, name, floor, floorplanfn);
-CREATE TABLE racks (id INTEGER PRIMARY KEY AUTOINCREMENT, locationid integer, usize integer, depth integer, comments,model,label, revnums integer);
+CREATE TABLE racks (id INTEGER PRIMARY KEY AUTOINCREMENT, locationid integer, usize integer, depth integer, comments,model,label, revnums integer, locareaid number);
+CREATE TABLE settings(companytitle, dateformat, currency, lang, version, timezone);
 CREATE TABLE soft2inv(invid integer,softid integer);
 CREATE TABLE software (id INTEGER PRIMARY KEY autoincrement, invoiceid integer,slicenseinfo ,stype ,manufacturerid integer ,stitle ,sversion ,sinfo ,purchdate integer,licqty integer, lictype integer);
 CREATE TABLE software2file(softwareid INTEGER,fileid INTEGER);

diff --git a/index.php b/index.php