manqod 1.1530.0 → 1.1532.0
Sign up to get free protection for your applications and to get access to all the features.
@@ -442,6 +442,7 @@ class ListModel
|
|
442
442
|
def load_data(notifier,ids=nil)
|
443
443
|
# @thread=Thread.new{
|
444
444
|
ids=[ids] if !ids.nil? and ids.class != Array
|
445
|
+
ids.uniq! if ids.class == Array
|
445
446
|
edebug("called for data_load for #{ids.inspect} by #{notifier}","list","info")
|
446
447
|
begin
|
447
448
|
we_have_server=drbmodel.alive?
|
@@ -536,8 +537,8 @@ class ListModel
|
|
536
537
|
piter=@id_index[row[@column_of_tree].to_i]
|
537
538
|
if iter=@id_index[row_id]
|
538
539
|
#iter is found
|
539
|
-
if iter.parent!=piter
|
540
|
-
|
540
|
+
if iter && iter.parent!=piter
|
541
|
+
edebug("current parent:#{iter.parent.inspect}!=new parent:#{piter.inspect} -> we remove iter, so we readd it later, thus reparenting it","list")
|
541
542
|
parent_iter=iter.parent
|
542
543
|
rec_save_childs(iter)
|
543
544
|
iter=nil
|
@@ -545,7 +546,7 @@ class ListModel
|
|
545
546
|
end
|
546
547
|
end
|
547
548
|
unless iter=@id_index[row_id]
|
548
|
-
|
549
|
+
edebug("new iter, id:#{row_id.inspect}","list")
|
549
550
|
if @tree_key then
|
550
551
|
list.set_model(nil) if !piter.nil? and !piter.has_child?
|
551
552
|
iter=@data.append(piter)
|
@@ -564,7 +565,7 @@ class ListModel
|
|
564
565
|
reload_saved_childs if need_to_reload
|
565
566
|
refilter(iter)
|
566
567
|
else
|
567
|
-
|
568
|
+
edebug("we were called to load_data of a non existing id:#{row_id}, which means it's archive and we don't show archive","list")
|
568
569
|
if iter_to_remove=@id_index[row_id]
|
569
570
|
data.remove(iter_to_remove)
|
570
571
|
@id_index.delete(row_id)
|
@@ -581,7 +582,7 @@ class ListModel
|
|
581
582
|
end
|
582
583
|
}
|
583
584
|
gstart=Time.new
|
584
|
-
|
585
|
+
list.set_model(@sorter) if list.model.nil?
|
585
586
|
gtime=Time.new.to_f-gstart.to_f
|
586
587
|
Gtk.thread_protect{list.scroll_to_cursor}
|
587
588
|
|
@@ -165,10 +165,10 @@ class Gantt < Gtk::Viewport
|
|
165
165
|
def update(notifier)
|
166
166
|
if list.model && model && list.list_model.column_of_gantt_start && list.list_model.column_of_gantt_duration
|
167
167
|
@start_column=list.list_model.column_of_gantt_start["model_col"].to_i if list.list_model.column_of_gantt_start
|
168
|
-
@start_editable=list.list_model.column_of_gantt_start["editable"]
|
168
|
+
@start_editable=list.list_model.column_of_gantt_start["editable"] if list.list_model.column_of_gantt_start
|
169
169
|
@dur_column=list.list_model.column_of_gantt_duration["model_col"].to_i if list.list_model.column_of_gantt_duration
|
170
170
|
@successors_column=list.list_model.column_of_gantt_successors["model_col"].to_i if list.list_model.column_of_gantt_successors
|
171
|
-
@successors_editable=list.list_model.column_of_gantt_successors["editable"]
|
171
|
+
@successors_editable=list.list_model.column_of_gantt_successors["editable"] if list.list_model.column_of_gantt_successors
|
172
172
|
@group_column=list.list_model.column_of_gantt_group["model_col"].to_i if list.list_model.column_of_gantt_group
|
173
173
|
@partial_column=list.list_model.column_of_gantt_partial["model_col"].to_i if list.list_model.column_of_gantt_partial
|
174
174
|
@group_color_column=list.list_model.column_of_gantt_group_color["model_col"].to_i if list.list_model.column_of_gantt_group_color
|
metadata
CHANGED
@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
|
|
4
4
|
prerelease: false
|
5
5
|
segments:
|
6
6
|
- 1
|
7
|
-
-
|
7
|
+
- 1532
|
8
8
|
- 0
|
9
|
-
version: 1.
|
9
|
+
version: 1.1532.0
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Dobai-Pataky Balint
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2011-
|
17
|
+
date: 2011-05-01 00:00:00 +03:00
|
18
18
|
default_executable:
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|