task-manager 0.1.6 → 0.1.7

data/app/assets/javascripts/task-manager/extjs/app/controller/Plans.js

@@ -123,7 +123,7 @@ Ext.define('TM.controller.Plans', {
       Ext.create('TM.model.Plan');
 
     if(attrs.autocompletable == "on") {
-      delete attrs["callables_attributes"];
+       attrs.callables_attributes = [];
     }
     attrs.autocompletable = attrs.autocompletable ? true: false;
     record.set(attrs);

data/app/assets/javascripts/task-manager/extjs/app/controller/Tasks.js

@@ -53,7 +53,7 @@ Ext.define('TM.controller.Tasks', {
 
       var selected = btn.up('task_grid').getSelectionModel().getSelection();
       Ext.each(selected, function(s){
-        this.callParent(arguments);
+        s.destroy();
 
     		if(this.store) this.store.remove(this);
       });

data/app/assets/javascripts/task-manager/extjs/app/view/task/Search.js

@@ -1,148 +1,147 @@
-Ext.define('TM.view.task.Search', {
-	extend: 'Ext.form.Panel',
-	xtype: 'task_search',
-
-	border: 0,
-  bodyPadding: '5 5 0',
-
-  items: [{
-    xtype: 'fieldset',
-    id: 'fieldset',
-    title: '查询',
-
-    layout: {
-      type: 'form',
-      border: 0,
-      margin: 2
-    },
-    items: [{
-      border: 0,
-      items: [{
-        layout: 'column',
-        border: 0,
-        defaults: {
-          xtype: 'textfield',
-          id: 'textfield',
-          labelAlign: 'right',
-          width: 300,
-          labelWidth: 130
-        },
-        items: [{
-          fieldLabel: '名称',
-          name: 'q[name_cont]'
-        }, {
-          fieldLabel: '周期',
-          editable: false,
-          xtype: 'combo',
-          id: 'types',
-          store: 'TM.store.Types',
-          valueField: 'value',
-          name: 'q[task_type_eq]'
-        }, {
-          fieldLabel: '状态',
-          xtype: 'combo',
-          editable: false,
-          valueField: 'value',
-          store: 'TM.store.Statuses',
-          name: 'q[status_eq]'
-        }]
-      }, {
-        layout: 'column',
-        border: 0,
-        defaults: {
-          border: 0,
-          labelAlign: 'right',
-          width: 300,
-          labelWidth: 130
-        },
-        items: [{
-          layout: 'column',
-          border: 0,
-          defaults: {
-            xtype: 'datefield',
-            id: 'datefield',
-            labelAlign: 'right',
-            width: 300,
-            labelWidth: 130
-          },
-          items: [{
-            fieldLabel: '完成时间 从',
-            format: 'Y-m-d',
-            editable: false,
-            name: 'q[finished_at_gteq]',
-            id: 'last_task'
-          }, {
-            fieldLabel: '截至时间 从',
-            format: 'Y-m-d',
-            xtype: 'datefield',
-            editable: false,
-            name: 'q[deadline_gteq]'
-          }]
-        }, {
-          layout: 'column',
-          border: 0,
-          defaults: {
-            xtype: 'datefield',
-            labelAlign: 'right',
-            width: 300,
-            labelWidth: 130
-          },
-          items: [{
-            fieldLabel: '至',
-            format: 'Y-m-d',
-            editable: false,
-            name: 'q[finished_at_lteq]'
-          }, {
-            fieldLabel: '至',
-            format: 'Y-m-d',
-            xtype: 'datefield',
-            editable: false,
-            name: 'q[deadline_lteq]'
-          }]
-        }, {
-          layout: 'hbox',
-          margin: '20 0 0 60',
-          items: [{
-            xtype: 'button',
-            formBind: true,
-            width: 60,
-            text: '查询',
-            action: 'query'
-          }, {
-            xtype: 'button',
-            margin: '0 0 0 20',
-            width: 60,
-            text: '重置',
-            action: 'reset'
-          }]
-        }]
-      }],
-    }]
-  }],
-
-  // buttons: [{
-  //   formBind: true,
-  //   width: 60,
-  //   text: '查询',
-  //   action: 'query'
-  // }, {
-  //   margin: '0 0 0 20',
-  //   width: 60,
-  //   text: '重置',
-  //   action: 'reset'
-  // }],
-
-  hasQueryParams: function() {
-    var hasParams = false;
-    Ext.Object.each(this.getValues(), function(key, value) {
-      if(value) {
-       hasParams = true;
-
-       // Break each
-       return false;
-      }
-    });
-
-    return hasParams;
-  }
-});
+Ext.define('TM.view.task.Search', {
+	extend: 'Ext.form.Panel',
+	xtype: 'task_search',
+
+	border: 0,
+  bodyPadding: '5 5 0',
+
+  items: [{
+    xtype: 'fieldset',
+    id: 'fieldset',
+    title: '查询',
+
+    layout: {
+      type: 'form',
+      border: 0,
+      margin: 2
+    },
+    items: [{
+      border: 0,
+      items: [{
+        layout: 'column',
+        border: 0,
+        defaults: {
+          xtype: 'textfield',
+          labelAlign: 'right',
+          width: 300,
+          labelWidth: 130
+        },
+        items: [{
+          fieldLabel: '名称',
+          name: 'q[name_cont]'
+        }, {
+          fieldLabel: '周期',
+          editable: false,
+          xtype: 'combo',
+          id: 'types',
+          store: 'TM.store.Types',
+          valueField: 'value',
+          name: 'q[task_type_eq]'
+        }, {
+          fieldLabel: '状态',
+          xtype: 'combo',
+          editable: false,
+          valueField: 'value',
+          store: 'TM.store.Statuses',
+          name: 'q[status_eq]'
+        }]
+      }, {
+        layout: 'column',
+        border: 0,
+        defaults: {
+          border: 0,
+          labelAlign: 'right',
+          width: 300,
+          labelWidth: 130
+        },
+        items: [{
+          layout: 'column',
+          border: 0,
+          defaults: {
+            xtype: 'datefield',
+            id: 'datefield',
+            labelAlign: 'right',
+            width: 300,
+            labelWidth: 130
+          },
+          items: [{
+            fieldLabel: '完成时间 从',
+            format: 'Y-m-d',
+            editable: false,
+            name: 'q[finished_at_gteq]',
+            id: 'last_task'
+          }, {
+            fieldLabel: '截止时间 从',
+            format: 'Y-m-d',
+            xtype: 'datefield',
+            editable: false,
+            name: 'q[deadline_gteq]'
+          }]
+        }, {
+          layout: 'column',
+          border: 0,
+          defaults: {
+            xtype: 'datefield',
+            labelAlign: 'right',
+            width: 300,
+            labelWidth: 130
+          },
+          items: [{
+            fieldLabel: '至',
+            format: 'Y-m-d',
+            editable: false,
+            name: 'q[finished_at_lteq]'
+          }, {
+            fieldLabel: '至',
+            format: 'Y-m-d',
+            xtype: 'datefield',
+            editable: false,
+            name: 'q[deadline_lteq]'
+          }]
+        }, {
+          layout: 'hbox',
+          margin: '20 0 0 60',
+          items: [{
+            xtype: 'button',
+            formBind: true,
+            width: 60,
+            text: '查询',
+            action: 'query'
+          }, {
+            xtype: 'button',
+            margin: '0 0 0 20',
+            width: 60,
+            text: '重置',
+            action: 'reset'
+          }]
+        }]
+      }],
+    }]
+  }],
+
+  // buttons: [{
+  //   formBind: true,
+  //   width: 60,
+  //   text: '查询',
+  //   action: 'query'
+  // }, {
+  //   margin: '0 0 0 20',
+  //   width: 60,
+  //   text: '重置',
+  //   action: 'reset'
+  // }],
+
+  hasQueryParams: function() {
+    var hasParams = false;
+    Ext.Object.each(this.getValues(), function(key, value) {
+      if(value) {
+       hasParams = true;
+
+       // Break each
+       return false;
+      }
+    });
+
+    return hasParams;
+  }
+});

data/app/models/task_manager/plan.rb

@@ -67,7 +67,11 @@ module TaskManager
           assignee_id: a.assignee_id,
           assignee_type: a.assignee_type,
         )
-        t.callables = callables
+        #t.callables = callables
+        t.callables = []
+        callables.each do |c|
+          t.callables << Callable.create!(callback_id: c.callback_id, callback_type: c.callback_type)
+        end
       end
     end
 

data/lib/task-manager/version.rb

@@ -1,3 +1,3 @@
 module TaskManager
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: task-manager
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -324,7 +324,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3025342267253612574
+      hash: 2365895014508148631
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -333,10 +333,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3025342267253612574
+      hash: 2365895014508148631
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: With TaskManager, you can manage and trace your routine tasks.