Skip to content

Commit cdc6f28

Browse files
author
Richard Jones
committed
merge from maint-0-7
1 parent a3df8a2 commit cdc6f28

File tree

12 files changed

+86
-74
lines changed

12 files changed

+86
-74
lines changed

doc/announcement.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@ disutils-based install script is provided.
6363

6464
It comes with two issue tracker templates (a classic bug/feature tracker and
6565
a minimal skeleton) and seven database back-ends (anydbm, bsddb, bsddb3,
66-
sqlite, metakit, mysql and postgresql).
66+
sqlite, metakit, mysql and postgresql).
6767

doc/developers.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Developing Roundup
33
==================
44

5-
:Version: $Revision: 1.6 $
5+
:Version: $Revision: 1.7 $
66

77
Note: the intended audience of this document is the developers of the core
88
Roundup code. If you just wish to alter some behaviour of your Roundup
@@ -43,7 +43,7 @@ CVS stuff:
4343

4444
1. to make a branch (eg. branching for code freeze/release)::
4545

46-
cvs co -d maint-0-5 -r release-0-5-0-pr1
46+
cvs co -d maint-0-5 -r release-0-5-0-pr1 roundup
4747
cd maint-0-5
4848
cvs tag -b maint-0-5
4949

doc/index.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ Thanks also to the many people on the mailing list, in the sourceforge
6464
project and those who just report bugs:
6565
Thomas Arendsen Hein,
6666
Anthony Baxter,
67+
Marlon van den Berg,
6768
Bo Berglund,
6869
Cameron Blackwood,
6970
Jeff Blaine,
@@ -77,6 +78,7 @@ Kelley Dagley,
7778
Paul F. Dubois,
7879
Jeff Epler,
7980
Tom Epperly,
81+
Tamer Fahmy,
8082
Hernan Martinez Foffani,
8183
Stuart D. Gathman,
8284
Ajit George,

doc/upgrading.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,40 @@ Please read each section carefully and edit your tracker home files
66
accordingly. Note that there is information about upgrade procedures in the
77
`administration guide`_.
88

9+
If a specific version transition isn't mentioned here (eg. 0.6.7 to 0.6.8)
10+
then you don't need to do anything. If you're upgrading from 0.5.6 to
11+
0.6.8 though, you'll need to check the "0.5 to 0.6" and "0.6.x to 0.6.3"
12+
steps.
13+
914
.. contents::
1015

16+
Migrating from 0.7.0 to 0.7.1
17+
=============================
18+
19+
0.7.1 Permission assignments
20+
----------------------------
21+
22+
If you allow anonymous access to your tracker, you might need to assign
23+
some additional View (or Edit if your tracker is that open) permissions
24+
to the "anonymous" user. To do so, find the code in your ``dbinit.py`` that
25+
says::
26+
27+
for cl in 'issue', 'file', 'msg', 'query', 'keyword':
28+
p = db.security.getPermission('View', cl)
29+
db.security.addPermissionToRole('User', p)
30+
p = db.security.getPermission('Edit', cl)
31+
db.security.addPermissionToRole('User', p)
32+
for cl in 'priority', 'status':
33+
p = db.security.getPermission('View', cl)
34+
db.security.addPermissionToRole('User', p)
35+
36+
Add add a line::
37+
38+
db.security.addPermissionToRole('Anonymous', p)
39+
40+
next to the existing ``'User'`` lines for the Permissions you wish to
41+
assign to the anonymous user.
42+
1143

1244
Migrating from 0.6 to 0.7
1345
=========================

roundup/backends/back_sqlite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: back_sqlite.py,v 1.27 2004-05-02 23:16:05 richard Exp $
1+
# $Id: back_sqlite.py,v 1.28 2004-05-10 00:39:40 richard Exp $
22
'''Implements a backend for SQLite.
33
44
See https://pysqlite.sourceforge.net/ for pysqlite info
@@ -202,7 +202,7 @@ def update_class(self, spec, old_spec, force=0, adding_v2=0):
202202
self.create_class_table(spec)
203203

204204
if olddata:
205-
inscols = ['_actor', '_activity', '_creation', '_creator']
205+
inscols = ['id', '_actor', '_activity', '_creation', '_creator']
206206
for propname,x in new_spec[1]:
207207
prop = properties[propname]
208208
if isinstance(prop, hyperdb.Multilink):

roundup/instance.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717
#
18-
# $Id: instance.py,v 1.12 2004-02-11 23:55:08 richard Exp $
18+
# $Id: instance.py,v 1.13 2004-05-10 00:34:48 richard Exp $
1919

2020
'''Tracker handling (open tracker).
2121
@@ -44,7 +44,7 @@ def open(self):
4444

4545

4646
def _load_python(self, file):
47-
file = os.path.join(tracker_home, file)
47+
file = os.path.join(self.tracker_home, file)
4848
vars = Vars()
4949
execfile(file, vars.__dict__)
5050
return vars

roundup/rfc2822.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
hqre = re.compile(r'^[A-z0-9!"#$%%&\'()*+,-./:;<=>?@\[\]^_`{|}~ ]+$')
2020

21+
CRLF = '\r\n'
22+
2123
def base64_decode(s, convert_eols=None):
2224
"""Decode a raw base64 string.
2325

roundup/scripts/roundup_server.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
"""Command-line script that runs a server over roundup.cgi.client.
1919
20-
$Id: roundup_server.py,v 1.46 2004-04-20 21:57:16 richard Exp $
20+
$Id: roundup_server.py,v 1.47 2004-05-10 00:38:38 richard Exp $
2121
"""
2222
__docformat__ = 'restructuredtext'
2323

@@ -94,8 +94,8 @@ def run_cgi(self):
9494
self.inner_run_cgi()
9595
except client.NotFound:
9696
self.send_error(404, self.path)
97-
except client.Unauthorised:
98-
self.send_error(403, self.path)
97+
except client.Unauthorised, message:
98+
self.send_error(403, '%s (%s)'%(self.path, message))
9999
except:
100100
exc, val, tb = sys.exc_info()
101101
if hasattr(socket, 'timeout') and isinstance(val, socket.timeout):

templates/classic/html/help_controls.js

Lines changed: 15 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,6 @@
33

44
original_field = window.opener.document.itemSynopsis[field].value;
55

6-
7-
// pop() and push() methods for pre5.5 IE browsers
8-
9-
function bName() {
10-
// test for IE
11-
if (navigator.appName == "Microsoft Internet Explorer")
12-
return 1;
13-
return 0;
14-
}
15-
16-
function bVer() {
17-
// return version number (e.g., 4.03)
18-
msieIndex = navigator.appVersion.indexOf("MSIE") + 5;
19-
return(parseFloat(navigator.appVersion.substr(msieIndex,3)));
20-
}
21-
22-
function pop() {
23-
// make a pop method for old IE browsers
24-
var lastElement = this[this.length - 1];
25-
this.length--;
26-
return lastElement;
27-
}
28-
29-
function push() {
30-
// make a pop method for old IE browsers
31-
var sub = this.length;
32-
for (var i = 0; i < push.arguments.length; ++i) {
33-
this[sub] = push.arguments[i];
34-
sub++;
35-
}
36-
}
37-
38-
// add the pop() and push() method to Array if they're not there
39-
if (!Array.prototype.pop) {
40-
Array.prototype.pop = pop;
41-
}
42-
if (!Array.prototype.push) {
43-
Array.prototype.push = push;
44-
}
45-
466
function trim(value) {
477
var temp = value;
488
var obj = /^(\s*)([\W\w]*)(\b\s*$)/;
@@ -53,21 +13,21 @@ function trim(value) {
5313
}
5414

5515
function determineList() {
56-
// generate a comma-separated list of the checked items
57-
if (document.frm_help.check==undefined) { return; }
58-
var list = new Array();
59-
if (document.frm_help.check.length==undefined) {
60-
if (document.frm_help.check.checked) {
61-
list.push(document.frm_help.check.value);
62-
}
63-
} else {
64-
for (box=0; box < document.frm_help.check.length; box++) {
65-
if (document.frm_help.check[box].checked) {
66-
list.push(document.frm_help.check[box].value);
67-
}
68-
}
69-
}
70-
return new String(list.join(','));
16+
// generate a comma-separated list of the checked items
17+
var list = new String('');
18+
for (box=0; box < document.frm_help.check.length; box++) {
19+
if (document.frm_help.check[box].checked) {
20+
if (list.length == 0) {
21+
separator = '';
22+
}
23+
else {
24+
separator = ',';
25+
}
26+
// we used to use an Array and push / join, but IE5.0 sux
27+
list = list + separator + document.frm_help.check[box].value;
28+
}
29+
}
30+
return list;
7131
}
7232

7333
function updateList() {

templates/classic/html/issue.search.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<span metal:fill-slot="body_title" tal:omit-tag="python:1">Issue searching</span>
44
<td class="content" metal:fill-slot="content">
55

6-
<form method="GET" tal:attributes="action request/classname">
6+
<form method="GET" name="itemSynopsis"
7+
tal:attributes="action request/classname">
78

89
<table class="form" tal:define="
910
cols python:request.columns or 'id activity title status assignedto'.split();

0 commit comments

Comments
 (0)