Merge pull request #1048 from functional-cloudysky/dev

문서 API

route/api_raw.py

@@ -4,11 +4,15 @@ def api_raw_2(conn, name):
     curs = conn.cursor()
 
     if acl_check(name, 'render') != 1:
-        curs.execute(db_change("select data from data where title = ?"), [name])
+        rev = flask.request.args.get('num', '')
+        if rev != '':
+            curs.execute(db_change("select data from history where title = ? and id = ?"), [name, rev])
+        else:
+            curs.execute(db_change("select data from data where title = ?"), [name])
         data = curs.fetchall()
         if data:
             json_data = { "title" : name, "data" : render_set(title = name, data = data[0][0], s_data = 1) }
 
             return flask.jsonify(json_data)
         
-    return flask.jsonify({})
+    return flask.jsonify({})

route/api_w.py

@@ -15,7 +15,11 @@ def api_w_2(conn, name):
 
                 return flask.jsonify({ "title" : name, "data" : g_data[0], "js_data" : g_data[1] })
             else:
-                curs.execute(db_change("select data from data where title = ?"), [name])
+                rev = flask.request.args.get('num', '')
+                if rev != '':
+                    curs.execute(db_change("select data from history where title = ? and id = ?"), [name, rev])
+                else:
+                    curs.execute(db_change("select data from data where title = ?"), [name])
                 data = curs.fetchall()
                 if data:
                     json_data = data[0][0]
@@ -43,4 +47,4 @@ def api_w_2(conn, name):
 
                     return flask.jsonify({ "title" : name, "data" : g_data[0], "js_data" : g_data[1] })
 
-    return flask.jsonify({})
+    return flask.jsonify({})