Author: ralfbecker
New Revision: 55264
URL: http://svn.stylite.de/viewvc/egroupware?rev=55264&view=rev
Log:
permanently showing a multiple queue selection, if more then one tracker allowed
Modified:
trunk/tracker/inc/class.tracker_ui.inc.php
trunk/tracker/js/app.js
trunk/tracker/lang/egw_de.lang
trunk/tracker/lang/egw_en.lang
trunk/tracker/templates/default/index.xet
— trunk/tracker/inc/class.tracker_ui.inc.php (original)
+++ trunk/tracker/inc/class.tracker_ui.inc.php Sat Mar 5 10:47:26 2016
@@ -649,7 +649,7 @@
$account_select_pref = $GLOBALS[‘egw_info’][‘user’][‘preferences’][‘common’][‘account_selection’];
$sel_options = array(
‘tr_tracker’ => &$this->trackers,
-
'cat_id' => array_merge(array(lang('All categories')), $this->get_tracker_labels('cat',$tracker)),
'tr_version' => $this->get_tracker_labels('version',$tracker),
'tr_priority' => $this->get_tracker_priorities($tracker,$content['cat_id']),
'tr_status' => &$statis,
@@ -868,14 +868,13 @@
if (empty($query['col_filter']['tr_tracker']))
{
-
$trtofilter = array_keys($this->trackers);
-
//_debug_array($trtofilter);
-
$query['col_filter']['tr_tracker'] = $tracker = $trtofilter;
@@ -972,7 +971,7 @@
}
else
{
@@ -984,7 +983,7 @@
$rows[‘sel_options’][‘assigned’] = $rows[‘sel_options’][‘tr_assigned’]; // For context menu popup
unset($rows[‘sel_options’][‘assigned’][‘not’]);
@@ -1006,7 +1005,7 @@
$rows['sel_options']['tr_status'] = $this->filters+$statis;
$rows['sel_options']['cat_id'] = $cats;
@@ -1030,7 +1029,7 @@
if ($rows[‘col_filter’][‘cat_id’]) $rows[‘no_cat_id’] = true;
// enable tracker column if all trackers are shown
@@ -1283,7 +1282,7 @@
if (!is_array($content['nm']) || !$content['nm']['get_rows'])
{
— trunk/tracker/js/app.js (original)
+++ trunk/tracker/js/app.js Sat Mar 5 10:47:26 2016
@@ -4,7 +4,7 @@
-
-
@copyright © 2008-16 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
-
@license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-
@version $Id$
*/
@@ -14,7 +14,7 @@
-
-
@augments AppJS
/
-app.classes.tracker = AppJS.extend(
+app.classes.tracker = (function(){ “use strict”; return AppJS.extend(
{
appname: ‘tracker’,
/*
@@ -50,20 +50,31 @@
- and ready. If you must store a reference to the et2 object,
- make sure to clean it up in destroy().
-
-
-
@param et2 etemplate2 Newly ready object
- */
- et2_ready: function(et2)
-
-
-
@param {string} _name name of template loaded
- */
- et2_ready: function(_et2, _name)
{
// call parent
this._super.apply(this, arguments);
-
-
switch(_name)
-
{
-
case 'tracker.admin':
-
this.acl_queue_access();
-
break;
-
-
case 'tracker.edit':
-
this.edit_popup();
-
break;
-
-
case 'tracker.index':
-
if (this.et2.getArrayMgr('content').getEntry('nm[only_tracker]'))
-
// there's no this.et2.getWidgetById('colfilter[tr_tracker]').hide() and
-
// jQuery(this.et2.getWidgetById('colfilter[tr_tracker]').getDOMNode()).hide()
-
// hides already hiden selectbox and not the choosen container :(
-
jQuery('#tracker_index_col_filter_tr_tracker__chzn').hide();
-
break;
}
},
@@ -101,40 +112,6 @@
},
/**
-
- Set the state / apply a favorite
-
- Overridden from the parent to set the queue to multiple if there are
-
- more than one in the state
- */
- setState: function(state)
- {
-
// State should be an object, not a string, but we'll parse
-
if(typeof state == "string")
-
{
-
if(state.indexOf('{') != -1 || state =='null')
-
{
-
state = JSON.parse(state);
-
}
-
}
-
if(typeof state == "object" && state != null && state.state && state.state.col_filter)
-
{
-
if(typeof state.state.col_filter.tr_tracker == 'object'
-
&& state.state.col_filter.tr_tracker &&
-
Object.keys(state.state.col_filter.tr_tracker).length > 1)
-
{
-
var template = etemplate2.getById('tracker-index') || null;
-
if(template)
-
{
-
var nm = template.widgetContainer.getWidgetById('nm');
-
nm.set_header_left('tracker.index.left_multiqueue');
-
}
-
}
-
}
-
// call parent
-
this._super.apply(this, arguments);
- },
-
- /**
-
- expand_filter
- Used in escalations on buttons to change filters from a single select to a multi-select
-
-
@param {object} _event
@@ -249,4 +226,4 @@
var widget = this.et2.getWidgetById(‘tr_summary’);
if(widget) return widget.options.value;
}
-});
+});}).call(this);
— trunk/tracker/lang/egw_de.lang (original)
+++ trunk/tracker/lang/egw_de.lang Sat Mar 5 10:47:26 2016
@@ -43,6 +43,7 @@
after how many days pending items should be closed automatic tracker de Nach wie vielen Tagen sollen schwebende Einträge automatisch geschlossen werden?
all tracker de Alle
all tickets are already converted to tracker tracker de alle Tickets sind bereits umgewandelt
+all versions tracker de Alle Versionen
allow bounties tracker de Prämien erlauben
allow creating of restricted comments which are only visible for admins, technicians and assigned users tracker de Dürfen Kommentare mit eingeschränkter Sichtbarkeit (nur für Administratoren, Techniker, Zugewiesenen Benutzer) erstellt werden.
allow creation of infolog entries from tracker tickets tracker de Dürfen Infologs aus dem Ticketsystem erstellt werden.
— trunk/tracker/lang/egw_en.lang (original)
+++ trunk/tracker/lang/egw_en.lang Sat Mar 5 10:47:26 2016
@@ -43,6 +43,7 @@
after how many days pending items should be closed automatic tracker en After how many days pending items should be closed automatically?
all tracker en All
all tickets are already converted to tracker tracker en All tickets are already converted to Tracker
+all versions tracker en All versions
allow bounties tracker en Allow bounties
allow creating of restricted comments which are only visible for admins, technicians and assigned users tracker en Allow creating of restricted comments which are only visible for admins, technicians and assigned users
allow creation of infolog entries from tracker tickets tracker en Allow creation of infolog entries from tracker tickets
— trunk/tracker/templates/default/index.xet (original)
+++ trunk/tracker/templates/default/index.xet Sat Mar 5 10:47:26 2016
@@ -123,7 +123,7 @@
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
