Ralf Becker
03e379e570
* jQuery: changed $ to $j to work around mootools use in Joomla templates and other js code in imported projects
...
required to change $ --> $j:
phpgwapi/*
jdots/*
etemplate/*
stylite/*
felamimail/*
admin/*
news_admin/*
projectmanager/*
importexport/*
infolog/*
ranking/*
required, but not automatic:
importexport/setup/etemplates.inc.php
phpgwapi/js/jquery/*
negative, not to touch or revert later:
phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php: '(\$(.+))' => 'print $1',
phpgwapi/js/dhtmlxtree/libCompiler/core.js
sitemgr/*
phpfreechat/*
gallery/*
activesync/include/smb.php: '^\tIPC\\\$(.*)[ ]+IPC' => 'skip',
etemplate/inc/class.bo_merge.inc.php: if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s',$content,$matches,PREG_SET_ORDER))
find phpgwapi jdots etemplate stylite felamimail admin news_admin projectmanager importexport infolog ranking \
\( -name '*.php' -o -name '*.js' \) -exec grep -q '\$(' {} \; -print \
-exec sed -i '' 's|\$(|$j(|g' {} \;
svn revert phpgwapi/inc/savant2/Savant2/Savant2_Compiler_basic.php phpgwapi/js/dhtmlxtree/libCompiler/core.js \
importexport/setup/etemplates.inc.php phpgwapi/js/jquery/jquery.js etemplate/inc/class.bo_merge.inc.php
additional changes:
phpgwapi/js/jquery/jquery.js: window.$ --> window.$j
phpgwapi/js/egw_json.js:291 this.request = $j.ajax({url: this.url,
jdots/templates/jdots/head.tpl:59 $j(document).ready(function() {
phpgwapi/js/egw_action/egw_grid_view.js: $.browser --> $j.browser
importexport/setup/etemplates.inc.php: etemplate editor importexport.wizard_basic_export_csv.choose_fields onclick of check icon changed
phpgwapi/js/egw_action/tests/*.html
phpgwapi/js/egw_action/tests/js/jquery.js: window.$ --> window.$j
2011-07-03 09:00:36 +00:00
Nathan Gray
9a9323e37d
If an admin edits a user's category, it becomes a global category.
2011-06-27 20:44:43 +00:00
Nathan Gray
1500c4f739
Fix warning message again
2011-06-27 15:54:07 +00:00
Nathan Gray
00cbf4b6fb
- Use full warning message for translation
...
- Rename phpgw to Global in app list
2011-06-27 15:49:42 +00:00
Nathan Gray
80c4d0d5c6
Fix owner selection:
...
- Make user's categories readonly in admin
- Fix display of group categories in preferences
2011-06-27 14:44:27 +00:00
Nathan Gray
fe7e8ef9ac
Don't warn about losing access for a new category
2011-06-27 14:34:40 +00:00
Nathan Gray
ec158c5e5c
Fix global filter excluding global cats limited to groups
2011-06-27 14:28:13 +00:00
Ralf Becker
25c3624caa
ignore acl only for admins
2011-06-24 14:22:15 +00:00
Ralf Becker
e960b79570
fixed not working access to all non-private user categories (ACL was priviously allways taken into account)
2011-06-24 13:35:39 +00:00
Nathan Gray
3d09b732e3
Fix All categories / Global categories filter
2011-06-22 21:17:16 +00:00
Nathan Gray
94d0b7c780
Fix filter for private, now only shown to owning user with 'Own categories'
2011-06-22 20:58:53 +00:00
Nathan Gray
d15e738692
Fix filter for personal categories under a global category
2011-06-22 20:45:42 +00:00
Nathan Gray
a9cd9ed96d
Restore 'All categories' for preferences
2011-06-22 19:59:22 +00:00
Nathan Gray
a7bccd968c
Admins can't edit global categories if they're not in Admin app
2011-06-22 19:54:41 +00:00
Nathan Gray
e4737a38a5
Fix child rows displayed multiple times
2011-06-22 19:40:35 +00:00
Nathan Gray
5424423f49
- Use separate session storage for each app
...
- Disable filter for Admin -> Global categories, there can't be personal categories there
2011-06-22 19:23:31 +00:00
Nathan Gray
1a7f460628
If admin edits a (private) category, it will now become public
2011-06-22 19:03:21 +00:00
Nathan Gray
bef50c4dbc
- Fix re-setting filter - set private to readonly if not in admin section, and user is not category owner
2011-06-22 19:01:00 +00:00
Nathan Gray
d9b12fd8ab
Make sure default filter is always properly set
2011-06-21 21:30:26 +00:00
Nathan Gray
a555588dbe
Use the same code for categories for preferences & admin, add context menu
2011-06-21 20:14:56 +00:00
Nathan Gray
1ab285100a
- Only show user to user, admins pick from groups
...
- Don't allow empty owner, use 0 if empty
2011-06-16 15:51:42 +00:00
Nathan Gray
3d9a9fc9de
Add filters for global / user to categories list
2011-06-15 22:27:40 +00:00
Nathan Gray
81f58ab129
- Change category group filtering to allow multiple groups
...
- Give warning when removing access from a group
2011-06-14 18:50:35 +00:00
Ralf Becker
a26a899ea0
* fixed not working deleted of application-global categories via "admin >> global categories" in applications
2011-02-15 12:51:21 +00:00
Klaus Leithoff
5c66c7d162
categories: better handling of editing/moving categories within the cat-tree
2010-10-14 15:33:10 +00:00
Klaus Leithoff
4a1fec7207
set the default for global_cats parameter to true\nreset start to 0, if we come back or view another apps categories\ntake care that the global_cats param survives the edit
2010-04-13 11:45:22 +00:00
Klaus Leithoff
f6a2c159a1
accept global_cats param
2010-04-13 10:29:05 +00:00
Ralf Becker
958452ff95
Implementation of global categories limited to a certain group:
...
- from user perspectiv they are global cat like the existing ones
(also comming in two flavors: global or for a certain app)
- admins can select to limit a global cat when they create it
--> all members of a given group have the cat as a global one
==> This does a silent modification of the categories table:
global cats get changed from cat_owner=-1 to cat_owner=0 !!!
2010-01-31 03:36:01 +00:00
Ralf Becker
38da9368b4
fixed a few typos / debug stuff
2010-01-31 03:28:32 +00:00
Ralf Becker
5073a8b24e
completly reworked admin >> global categories, in preparation for group specific global cats
2010-01-30 23:57:03 +00:00
