netzke-basepack 0.12.9 → 1.0.0.0.pre

data/lib/netzke/{basepack/tree/javascripts → tree/base/client}/extensions.js

@@ -1,4 +1,4 @@
-Ext.define('Netzke.classes.Basepack.Tree.Proxy', {
+Ext.define('Netzke.Tree.Proxy', {
   extend: 'Ext.data.proxy.Server',
 
   batch: function(options) {
@@ -10,7 +10,7 @@ Ext.define('Netzke.classes.Basepack.Tree.Proxy', {
   },
 
   read: function(operation, callback, scope) {
-    this.grid.serverRead(this.paramsFromOperation(operation), function(res) {
+    this.grid.server.read(this.paramsFromOperation(operation), function(res) {
       this.processResponse(true, operation, {}, res, callback, scope);
     }, this);
     return {};
@@ -19,7 +19,7 @@ Ext.define('Netzke.classes.Basepack.Tree.Proxy', {
   update: function(op, callback, scope) {
     var data = Ext.Array.map(op.getRecords(), function(r) { return r.getData(); });
 
-    this.grid.serverUpdate(data, function(res) {
+    this.grid.server.update(data, function(res) {
       var errors = [];
       Ext.each(op.records, function(r) {
         var rid = r.getId(),
@@ -36,7 +36,7 @@ Ext.define('Netzke.classes.Basepack.Tree.Proxy', {
       if (errors.length == 0) {
         // this.grid.getStore().load();
       } else {
-        this.grid.netzkeFeedback(errors);
+        this.grid.netzkeNotify(errors);
       }
     }, this);
   },
@@ -44,7 +44,7 @@ Ext.define('Netzke.classes.Basepack.Tree.Proxy', {
   destroy: function(op, callback, scope) {
     var data = Ext.Array.map(op.getRecords(), function(r) { return r.getData().id; });
     var store = this.grid.getStore();
-    this.grid.serverDelete(data, function(res){
+    this.grid.server.destroy(data, function(res){
       var errors = [];
       for (var id in res) {
         var error;
@@ -62,7 +62,7 @@ Ext.define('Netzke.classes.Basepack.Tree.Proxy', {
       store.commitChanges();
 
       if (errors.length > 0) {
-        this.grid.netzkeFeedback([errors]);
+        this.grid.netzkeNotify(errors);
       }
 
       // this.grid.getStore().load();
@@ -89,7 +89,7 @@ Ext.define('Netzke.classes.Basepack.Tree.Proxy', {
   }
 });
 
-/**
+/*
  * A fix for CheckColumn
  */
 Ext.override(Ext.ux.CheckColumn, {

data/lib/netzke/tree/endpoints.rb

@@ -0,0 +1,34 @@
+module Netzke
+  module Tree
+    module Endpoints
+      extend ActiveSupport::Concern
+
+      included do
+        endpoint :add_window__add_form__submit do |params|
+          data = ActiveSupport::JSON.decode(params[:data])
+          data["parent_id"] = params["parent_id"]
+          client.merge!(component_instance(:add_window).
+                      component_instance(:add_form).
+                      submit(data, client))
+          on_data_changed if client.netzke_set_form_values.present?
+          client.delete(:netzke_set_form_values)
+        end
+
+        endpoint :update_node_state do |params|
+          node = model_adapter.find_record(params[:id])
+          if node.respond_to?(:expanded)
+            node.expanded = params[:expanded]
+            model_adapter.save_record(node)
+          end
+        end
+
+        endpoint :update_parent_id do |records|
+          records.each do |record|
+            r = model_adapter.find_record(record[:id])
+            update_record(r, record)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/netzke/{basepack/viewport.rb → viewport/base.rb}

@@ -1,7 +1,7 @@
 module Netzke
-  module Basepack
-    class Viewport < Netzke::Base
-      js_configure do |c|
+  module Viewport
+    class Base < Netzke::Base
+      client_class do |c|
         c.extend = "Ext.container.Viewport"
       end
 

data/lib/netzke/{basepack/window.rb → window/base.rb}

@@ -1,10 +1,10 @@
 module Netzke
-  module Basepack
+  module Window
     # Ext.window.Window-based component. With +persistence+ option set to +true+, it will remember it's size, position, and maximized state.
     #
     # Example:
     #
-    #     class MyWindow < Netke::Basepack::Window
+    #     class MyWindow < Netke::Window::Base
     #       def configure
     #         super
     #         c.width = 800
@@ -14,23 +14,22 @@ module Netzke
     #
     #       component :users
     #     end
-    class Window < Netzke::Base
-      js_configure do |c|
+    class Base < Netzke::Base
+      client_class do |c|
         c.extend = "Ext.window.Window"
-        c.mixin
       end
 
-      def js_configure(c)
+      def configure_client(c)
         super
         [:x, :y, :width, :height].each { |p| c[p] = state[p].to_i if state[p] }
         c.maximized = state[:maximized] if state[:maximized]
       end
 
-      endpoint :set_size_and_position do |params, this|
+      endpoint :set_size_and_position do |params|
         [:x, :y, :width, :height].each {|p| state[p] = params[p].to_i}
       end
 
-      endpoint :set_maximized do |maximized,this|
+      endpoint :set_maximized do |maximized|
         maximized ? state[:maximized] = true : state.delete(:maximized)
       end
     end

data/lib/netzke/window/base/client/base.js

@@ -0,0 +1,26 @@
+{
+  layout: 'fit',
+
+  initComponent: function(){
+    this.callParent();
+
+    // set the move and resize events after window is shown, so that they don't fire at initial rendering
+    if (this.persistence) {
+      this.on("show", function(){
+        this.on("move", this.netzkeOnMoveResize, this);
+        this.on("resize", this.netzkeOnMoveResize, this);
+        this.on("maximize", Ext.Function.pass(this.netzkeOnMaximize, [true]), this);
+        this.on("restore", Ext.Function.pass(this.netzkeOnMaximize, [false]), this);
+      }, this);
+    }
+  },
+
+  netzkeOnMoveResize: function(){
+    var x = this.getPosition()[0], y = this.getPosition()[1], w = this.getSize().width, h = this.getSize().height;
+    this.server.setSizeAndPosition({x: x, y: y, width: w, height: h}); // API call
+  },
+
+  netzkeOnMaximize: function(maximized) {
+    this.server.setMaximized(maximized);
+  }
+}

data/locales/de.yml

@@ -1,7 +1,26 @@
 de:
   netzke:
-    basepack:
-      grid:
+    form:
+      base:
+        actions:
+          edit:
+            text: Bearbeiten
+            tooltip: Bearbeiten
+          cancel:
+            text: Abbrechen
+            tooltip: Bearbeiten abbrechen
+          apply:
+            text: Anwenden
+            tooltip: Änderungen speichern
+
+    grid:
+      base:
+        add_record: "%{model} hinzufügen"
+        edit_record: "%{model} bearbeiten"
+        edit_records: "%{models} bearbeiten"
+
+        confirmation: Bestätigung
+        are_you_sure: Bist du sicher?
         actions:
           add:
             text: Hinzufügen
@@ -9,55 +28,52 @@ de:
           edit:
             text: Bearbeiten
             tooltip: Bearbeiten
-          del:
+          delete:
             text: Löschen
             tooltip: Löschen
           apply:
             text: Anwenden
             tooltip: Anwenden
-          add_in_form:
-            text: extern Hinzufügen
-            tooltip: extern Hinzufügen
-          edit_in_form:
-            text: extern Bearbeiten
-            tooltip: extern Bearbeiten
           search:
             text: Suche
             tooltip: Suche
 
-        deleted_n_records:
-         one: "1 Datensatz wurde gelöscht"
-         other:  "%{count} Datensätze wurden gelöscht"
-        cannot_delete: "Du hast keine Berechtigung die Daten zu löschen"
-        confirmation: Bestätigung
-        are_you_sure: Bist du sicher?
-
-        record_form_window:
-          actions:
-            ok:
-              text: OK
-            cancel:
-              text: Abbrechen
-
-      search_window:
-        title: erweiterte Suche
+    tree:
+      base:
         actions:
+          add:
+            text: Hinzufügen
+            tooltip: Hinzufügen
+          edit:
+            text: Bearbeiten
+            tooltip: Bearbeiten
+          delete:
+            text: Löschen
+            tooltip: Löschen
+          apply:
+            text: Anwenden
+            tooltip: Anwenden
           search:
             text: Suche
+            tooltip: Suche
+
+    basepack:
+      cannot_delete: "Du hast keine Berechtigung die Daten zu löschen"
+
+      record_form_window:
+        actions:
+          ok:
+            text: OK
           cancel:
             text: Abbrechen
 
-      form:
+      search_window:
+        title: erweiterte Suche
         actions:
-          edit:
-            text: Bearbeiten
-            tooltip: Bearbeiten
+          search:
+            text: Suche
           cancel:
             text: Abbrechen
-            tooltip: Bearbeiten abbrechen
-          apply:
-            text: Anwenden
-            tooltip: Änderungen speichern
 
       search_panel:
         presets: Vorlagen

data/locales/en.yml

@@ -1,53 +1,58 @@
 en:
   netzke:
-    basepack:
-      tree:
+    tree:
+      base:
         actions:
           add:
             text: Add
           edit:
             text: Edit
-          del:
+          delete:
             text: Delete
-            tooltip: Delete
           apply:
             text: Apply
-          add_in_form:
-            text: Add in form
-          edit_in_form:
-            text: Edit in form
           search:
             text: Search
 
-      grid:
+    grid:
+      base:
+        add_record: "Add %{model}"
+        edit_record: "Edit %{model}"
+        edit_records: "Edit %{models}"
+
+        confirmation: Confirmation
+        are_you_sure: Are you sure?
+        proceed_with_unapplied_changes: You will lose uncommitted changes - do you want to proceed?
         actions:
           add:
             text: Add
           edit:
             text: Edit
-          del:
+          delete:
             text: Delete
-            tooltip: Delete
           apply:
             text: Apply
-          add_in_form:
-            text: Add in form
-          edit_in_form:
-            text: Edit in form
           search:
             text: Search
 
-        deleted_n_records:
-         one: "Deleted 1 record"
-         other: "Deleted %{count} records"
-        cannot_create: "You don't have permissions to create data"
-        cannot_read: "You don't have permissions to read data"
-        cannot_update: "You don't have permissions to update data"
-        cannot_delete: "You don't have permissions to delete data"
+      form:
+        base:
+          actions:
+            edit:
+              text: Edit
+              tooltip: Edit
+            cancel:
+              text: Cancel
+              tooltip: Cancel editing
+            apply:
+              text: Apply
+              tooltip: Apply changes
 
-        confirmation: Confirmation
-        are_you_sure: Are you sure?
-        proceed_with_unapplied_changes: You will lose uncommitted changes - do you want to proceed?
+    basepack:
+      cannot_create: "You don't have permissions to create data"
+      cannot_read: "You don't have permissions to read data"
+      cannot_update: "You don't have permissions to update data"
+      cannot_delete: "You don't have permissions to delete data"
 
       record_form_window:
         actions:
@@ -64,18 +69,6 @@ en:
           cancel:
             text: Cancel
 
-      form:
-        actions:
-          edit:
-            text: Edit
-            tooltip: Edit
-          cancel:
-            text: Cancel
-            tooltip: Cancel editing
-          apply:
-            text: Apply
-            tooltip: Apply changes
-
       search_panel:
         presets: Presets
         equals: Equals
@@ -111,10 +104,10 @@ en:
             text: Reset
             tooltip: Reset condition values
           save_preset:
-            text: Save preset
+            text: Save
             tooltip: Save preset
           delete_preset:
-            text: Delete preset
+            text: Delete
             tooltip: Delete preset
           apply:
             text: Apply

data/locales/es.yml

@@ -1,30 +1,56 @@
 es:
   netzke:
-    basepack:
-      grid:
+    form:
+      base:
+        actions:
+          edit:
+            text: Editar
+            tooltip: Editar
+          cancel:
+            text: Cancelar
+            tooltip: Cancelar edición
+          apply:
+            text: Aplicar
+            tooltip: Aplicar los cambios
+
+    grid:
+      base:
         actions:
           add:
             text: Agregar
           edit:
             text: Editar
-          del:
+          delete:
             text: Eliminar
             tooltip: Eliminar
           apply:
             text: Aplicar
-          add_in_form:
-            text: Agregar en formulario
-          edit_in_form:
-            text: Editar en formulario
           search:
             text: Buscar
 
-        deleted_n_records:
-         one: "Se ha eliminado 1 registro"
-         other: "Se han eliminado %{count} registro(s)"
-        cannot_delete: "Usted no tiene permiso para borrar los datos"
-        confirmation: Confirmación
-        are_you_sure: ¿Está seguro?
+    tree:
+      base:
+        add_record: "Agregar %{model}"
+        edit_record: "Editar %{model}"
+        edit_records: "Editar %{models}"
+
+        actions:
+          add:
+            text: Agregar
+          edit:
+            text: Editar
+          delete:
+            text: Eliminar
+            tooltip: Eliminar
+          apply:
+            text: Aplicar
+          search:
+            text: Buscar
+
+    basepack:
+      cannot_delete: "Usted no tiene permiso para borrar los datos"
+      confirmation: Confirmación
+      are_you_sure: ¿Está seguro?
 
       record_form_window:
         actions:
@@ -41,18 +67,6 @@ es:
           cancel:
             text: Cancelar
 
-      form:
-        actions:
-          edit:
-            text: Editar
-            tooltip: Editar
-          cancel:
-            text: Cancelar
-            tooltip: Cancelar edición
-          apply:
-            text: Aplicar
-            tooltip: Aplicar los cambios
-
       search_panel:
         presets: Búsquedas anteriores
         equals: Igual