• last updated 9 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Resolve conflicts after merging oacs-5-4

- improve import/export of category fields

    • -3
    • +20
    /openacs-4/packages/xowiki/tcl/import-procs.tcl
    • -27
    • +49
    /openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
- standardize expressions and comparison operations

changing call to category_tree::get_tree , -all is only a switch and not a parameter.

Adding space between vars object_id and ctx_id.

- Providing return_url form item-button class.

- Using the url in the package object as return_url; instead of using the url in the connection object.

- check for the existance of counter log, when it is first installed

- make sure, that xowiki uses only mapped category-trees (import, form-fields, ...)

- turn off per default extra fields for mapped categories in FormPages

(can be activated via form_constraints @categories:on)

- factor out common code

    • -9
    • +11
    /openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
- adjust to new categories interface

    • -1
    • +0
    /openacs-4/packages/xowiki/www/admin/list.adp
    • -4
    • +5
    /openacs-4/packages/xowiki/www/admin/list.tcl
- eliminated dead code

- added subsite::url callback implementation for resolving /o/*

references in categories

- added action for categories (instead of link)

- provide context for permission checking

    • -5
    • +6
    /openacs-4/packages/xowiki/www/admin/list.tcl
- remove useless "required" message for language (is always set)

- slightly extended message catalog

- fixed localization in context bar

- added new context variable ctx_id used for permission checking.

This optional variable allows to specify category clients

to provide am object, on which permissions are checked for

adding categories. This has the advantage that package_admin

could be allowed this way to add categories without needing

explicit rights on the categories package.

  1. … 25 more files in changeset.
fix 2 bugs

- call to a non-existing acs_object__new with 5 args

- 2 table references were incorrect in category_tree__copy

Fix typo user should be user_id

Fix typos in upgrade script

Add correct upgrade script versions

Remove old wrong upgrade scipts

Fix upgrade version numbers

- fix tag again (used wrong name)

    • -2
    • +2
    /openacs-4/packages/xowiki/tcl/package-procs.tcl
- fix setting of tag name

    • -2
    • +2
    /openacs-4/packages/xowiki/tcl/package-procs.tcl
- remove duplicated line

- make comment more general

- remove unneeded quotes

Rewrote the URL to file mapping stuff slightly so that it will work when

searching more than two directories. Bad hardwiring. Hard-to-read code.

New version will work for any number of search directories (as will happen

when package extensiblity is implemented) and IMO is easier to read and

a bit faster, too, when searching for an appropriate .vuh file to serve.

add debug info in case, channel::transfer fails

- change from folder_id to parent_id

    • -3
    • +3
    /openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
- provide better message for deprecated method

- protect channel transfer by a mutex

- check in bg-delivery whether the driver is "nssock"; otherwise, fall back to classical ns_returnfile

Added some keywords and icons in Environment edit (cockpit)

changing back to ad_..abort, so we don't get error notifications every time a customer registers as a part of a purchase

fixing broken reference