engine2 1.0.3 → 1.0.4

data/{views → app}/engine2.coffee

@@ -1,20 +1,15 @@
 'use strict'
+require 'angular-route'
+require 'angular-sanitize'
+require 'angular-animate'
+require 'angular-cookies'
+require 'angular-local-storage'
+require 'angular-ui-tree'
+require 'ng-file-upload'
+
 _.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
 
 angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule']) # 'draggabilly'
-.factory 'E2Snippets', ->
-    icon = (name) -> "<span class='glyphicon glyphicon-#{name}'></span>"
-    aicon = (name) -> "<i class='fa fa-#{name}'></i>"
-    ng_class_names = ['active', 'enabled', 'disabled']
-    icon: icon
-    aicon: aicon
-    boolean_true_value:     icon('check')
-    boolean_false_value:    icon('unchecked')
-    make_ng_class: (o) ->
-        out = []
-        _.each ng_class_names, (e) -> out.push(if e == 'enabled' then "'disabled': !(#{o[e]})" else "'#{e}': #{o[e]}") if o[e]?
-        if out.length > 0 then "ng-class=\"{#{out.join(',')}}\"" else ""
-
 .config ($httpProvider, $routeProvider, $compileProvider, localStorageServiceProvider, $logProvider) ->
     loaderOn = -> angular.element(document.querySelectorAll('.loader')).eq(-1).css("visibility", 'visible')
     $httpProvider.interceptors.push 'e2HttpInterceptor'
@@ -51,7 +46,23 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             $injector.get('$e2Modal').error("#{E2Snippets.icon('bell')} #{response.status}: #{message}", cause)
         $q.reject(response)
 
-.factory 'E2', ($templateCache, $http, E2Snippets, $e2Modal, $q, $injector, e2HttpInterceptor, $route, $dateFormatter) ->
+.factory 'E2Snippets', ->
+    icon = (name) -> "<span class='glyphicon glyphicon-#{name}'></span>"
+    aicon = (name) -> "<i class='fa fa-#{name}'></i>"
+    ng_class_names = ['active', 'enabled', 'disabled']
+    icon: icon
+    aicon: aicon
+    boolean_true_value:     icon('check')
+    boolean_false_value:    icon('unchecked')
+    make_ng_class: (o) ->
+        out = []
+        _.each ng_class_names, (e) -> out.push(if e == 'enabled' then "'disabled': !(#{o[e]})" else "'#{e}': #{o[e]}") if o[e]?
+        _.each(o.class, (v, k) -> out.push "#{k}: #{v}") if o.class?
+        if out.length > 0 then "ng-class=\"{#{out.join(',')}}\"" else ""
+
+.factory 'E2', ($templateCache, $http, E2Snippets, $e2Modal, $q, $injector, e2HttpInterceptor, $route, $dateFormatter, $parse) ->
+    globals: {}
+
     compact: (o) ->
         _.each o, (v, k) =>
             if (v == null || (_.isString(v) && !v)) || (!_.isDate(v) && _.isObject(v) && @compact(v) && _.isEmpty(v))
@@ -66,6 +77,7 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             else
                 # delete o[k]
                 o[k] = null
+
     merge: (dst, src) ->
         for k, v of src
             if _.isObject(v) && !_.isArray(v)
@@ -80,8 +92,8 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
     transpose: (a) ->
         _.keys(a[0]).map((c) -> a.map (r) -> r[c])
 
-    join_keys: (keys) -> keys.join('|')
-    split_keys: (key) -> key.split('|')
+    join_keys: (keys) -> keys.join(@globals.key_separator)
+    split_keys: (key) -> key.split(@globals.key_separator)
     id_for: (rec, meta) -> @join_keys(meta.primary_fields.map((e) -> rec[e]))
     from_id: (id, meta) -> _.zipObject(meta.primary_fields, id) # _.zip(meta.primary_fields, id).reduce(((rec, [k, v]) -> rec[k] = v; rec), {})
 
@@ -121,13 +133,15 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             m.click = fun_invoke
 
             if click
-                action[fun_name] = (args...) ->
-                    processor.arg_fun(action, args...)
+                action[fun_name] = (arg) ->
+                    processor.arg_fun(action, arg)
                     action.scope().$eval(click)
             else
-                action[fun_name] ?= (args...) ->
-                    processor.arg_fun(action, args...)
-                    action.invoke_action(m.name, processor.arg_ret(action))
+                action[fun_name] ?= (arg) ->
+                    processor.arg_fun(action, arg)
+                    args = processor.arg_ret(action)
+                    _.merge(args, $parse(m.arguments)(action.scope())) if m.arguments?
+                    action.invoke_action(m.name, args)
 
             if action.find_action_info(m.name, false)?
                 show = if m.show then " && " + m.show else ""
@@ -136,17 +150,16 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
     menu_processors:
         menu:
             arg_name: ''
-            arg_fun: (action) -> undefined
-            arg_ret: (action) -> undefined
+            arg_fun: (action) ->
+            arg_ret: (action) -> {}
         panel_menu:
             arg_name: ''
-            arg_fun: (action) -> undefined
-            arg_ret: (action) -> undefined
+            arg_fun: (action) ->
+            arg_ret: (action) -> {}
         item_menu:
             arg_name: '$index'
-            arg_ret: (action) -> id: action.current_id
-            arg_fun: (action, index) ->
-                action.current_id = $injector.get('E2').id_for(action.entries[index], action.meta)
+            arg_fun: (action, index) -> action.current_index = index
+            arg_ret: (action) -> id: action.current_id()
 
     renderers:
         boolean: (value, render) =>
@@ -180,7 +193,8 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             if f_info? && type = f_info.type
                 @renderers[type](value, f_info.render)
             else
-                (value + "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
+                if f_info?.escape == false then value else
+                    (value + "").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;")
         else
             value
 
@@ -200,7 +214,7 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             constructor: () ->
             backdrop_z_index: (num, index) -> angular.element(document.querySelectorAll('.modal-backdrop')).eq(num).css('z-index', index)
             modal_num: (num) -> angular.element(document.querySelectorAll('.modal')).eq(num)
-            backdrop: -> 'static'
+            backdrop: (bdr) -> bdr ? 'static'
             show_before: ->
                 @z_index = MManager.Z_INDEX + MManager.index * 2
                 @modal.css('z-index', @z_index + 1)
@@ -218,7 +232,7 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             constructor: () ->
                 super()
                 @threshold = 2
-            backdrop: -> if MManager.index > @threshold then false else super()
+            backdrop: (bdr) -> if MManager.index > @threshold then false else super(bdr)
             show_before: ->
                 super()
                 if MManager.index > @threshold
@@ -234,7 +248,7 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
                     @modal_num((MManager.index - 1) - @threshold).css('display', 'block')
 
         class SingleBackdropMManager extends MManager
-            backdrop: -> if MManager.index > 0 then false else super()
+            backdrop: (bdr) -> if MManager.index > 0 then false else super(bdr)
             show_before: ->
                 super()
                 @backdrop_z_index(0, @z_index)
@@ -253,33 +267,38 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
                 e.stopPropagation()
                 manager.modal = m.$element
                 manager.backdrop = m.$backdrop
-                throw "Modal has element" if scope.action.element?()
-                scope.action.element = -> m.$element
-                scope.action.panel_show?()
+                throw "Modal has element" if action.element?()
+                action.element = -> m.$element
+                action.panel_show?()
                 manager.show_before()
                 MManager.index++
 
             scope.$on 'modal.show', (e, m) ->
                 e.stopPropagation()
                 manager.show()
-                scope.action.panel_shown?()
+                action.panel_shown?()
 
             scope.$on 'modal.hide.before', (e) ->
                 e.stopPropagation()
                 MManager.index--
                 manager.hide_before()
-                scope.action.panel_hide?()
+                action.panel_hide?()
 
             scope.$on 'modal.hide', (e) ->
                 e.stopPropagation()
                 manager.hide()
-                scope.action.panel_hidden?()
+                action.panel_hidden?()
                 scope.$destroy()
 
-            $injector.get('E2').fetch_panel(scope.action.meta.panel, true).then (template) ->
-                # template = "<div class='modal' ng-class='action.meta.panel.class'>#{template}</div>"
-                modal = $modal(scope: scope, template: template, backdrop: manager.backdrop(), animation: 'am-fade', show: false)
-                scope.action.modal_hide = -> modal.$scope.$hide()
+            $injector.get('E2').fetch_panel(action.meta.panel, true).then (template) ->
+                modal = $modal
+                    scope: scope
+                    show: false
+                    template: template
+                    backdrop: manager.backdrop(action.meta.panel.backdrop)
+                    animation: action.meta.panel.animation ? 'am-fade'
+
+                action.modal_hide = -> modal.$scope.$hide()
                 modal.$promise.then ->
                     modal.show()
                     modal
@@ -385,31 +404,54 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             elem.after($compile(body)(scope))
 
 .directive 'e2TableBody', ($parse, $compile) ->
+    table_tmpl = _.template("<thead><tr>{{thead}}</tr></thead><tbody>{{tbody}}</tbody>")
     scope: false
     restrict: 'A'
     link: (scope, elem, attrs) ->
         scope.$on 'render_table', (a, ev) ->
             # ev.stopPropagation()
-            meta = scope.action.meta
-            selection = scope.action.selection
-            out = ''
-            _.each scope.action.entries, (e, i) ->
-                out += if selection then "<tr ng-class='action.selected_class(#{i})' class='tr_hover' ng-click='action.select(#{i}, $event)'>" else
+            action = scope.action
+            meta = action.meta
+            position = meta.menus.item_menu.properties.position ? 0
+            right_style = if position >= meta.fields.length then "style=\"text-align: right\"" else ""
+
+            thead = ""
+            fields = meta.fields.slice()
+            fields.splice(position, 0, null)
+            _.each fields, (f) ->
+                if f
+                    info = meta.info[f]
+                    thead += "<th>"
+                    title = if info.title then "title=\"#{info.title}\"" else ""
+                    if info.sort
+                        thead += "<a ng-click=\"action.order('#{f}')\" #{title}><strong>#{info.loc}</strong></a>"
+                        if action.ui.order == f
+                            cls = if action.ui.asc then "glyphicon-chevron-up" else "glyphicon-chevron-down"
+                            thead += " <span class=\"glyphicon #{cls}\"></span>"
+                    else
+                        thead += "<span #{title}>#{info.loc}</span>"
+                    thead += "</th>"
+                else
+                    thead += "<th class=\"#{meta.menus.menu.properties.class || ''}\" #{right_style}><div e2-button-set=\"action.meta.menus.menu\"></div></th>"
+
+            tbody = ""
+            _.each action.entries, (e, i) ->
+                tbody += if action.selection then "<tr ng-class=\"action.selected_class(#{i})\" class=\"tr_hover\" ng-click=\"action.select(#{i}, $event)\">" else
                     row_cls = e.$row_info?.class
                     if row_cls then "<tr class=\"#{row_cls}\">" else "<tr>"
-                out += "<td>"
-                out += "<div e2-button-set='action.meta.menus.item_menu' index='#{i}'></div>" if meta.config.show_item_menu
-                out += "</td>"
-                _.each meta.fields, (f) ->
-                    out += if col_cls = meta.info[f].column_class then "<td class='#{col_cls}'>" else "<td>"
-                    out += scope.action.list_cell(e, f) ? ''
-                    out += "</td>"
-                out += "</tr>"
+                _.each fields, (f) ->
+                    if f
+                        tbody += if col_cls = meta.info[f].column_class then "<td class=\"#{col_cls}\">" else "<td>"
+                        tbody += action.list_cell(e, f) ? ''
+                        tbody += "</td>"
+                    else
+                        tbody += "<td #{right_style}><div e2-button-set=\"action.meta.menus.item_menu\" index=\"#{i}\"></div></td>"
+                tbody += "</tr>"
 
             elem.empty()
-            elem.append($compile(out)(scope)) unless out.length == 0 # leak ?
+            elem.append($compile(table_tmpl thead: thead, tbody: tbody)(scope))
 
-.directive 'e2DropDown', ($parse, $dropdown, $timeout, E2Snippets) ->
+.directive 'e2Dropdown', ($parse, $dropdown, $timeout, E2Snippets) ->
     event_num = 0
     dropdown_sub_tmpl = _.template("<li class='dropdown-submenu'><a href=''> {{icon}}{{aicon}} {{loc}}</a>{{sub}}</li>")
     dropdown_tmpl = _.template("<li {{clazz}} {{show}} {{hide}}> <a href='{{href}}' {{click}}> {{icon}}{{aicon}} {{loc}}</a></li>")
@@ -446,7 +488,8 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             elem.off "mousedown"
             # event.preventDefault()
             # event.stopPropagation()
-            dropdown = $dropdown(elem, (scope: scope, template: render($parse(attrs.e2DropDown)(scope), 0), animation: 'am-flip-x', prefixEvent: "#{event_num}.tooltip")) # , delay: 1
+            menu = $parse(attrs.e2Dropdown)(scope)
+            dropdown = $dropdown(elem, (scope: scope, template: render(menu, 0), animation: attrs.animation || 'am-flip-x', prefixEvent: "#{event_num}.tooltip")) # , delay: 1
             dropdown.$promise.then ->
                 event_hide = scope.$on "#{event_num}.tooltip.hide", (e) ->
                     e.stopPropagation()
@@ -463,13 +506,14 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
 
 .directive 'e2ButtonSet', ($parse, $compile, E2Snippets) ->
     button_set_tmpl = _.template("<div class='btn btn-default' {{clazz}} {{click}} {{show}} {{hide}} {{title}}> {{icon}}{{aicon}} {{loc}}</div>")
-    button_set_arr_tmpl = _.template("<div class='btn btn-default' e2-drop-down='{{dropdown}}'>{{icon}}{{aicon}}<span class='caret'></span></div>")
+    button_set_arr_tmpl = _.template("<div class='btn btn-default' e2-dropdown='{{dropdown}}' data-animation='{{animation}}'>{{icon}}{{aicon}}<span class='caret'></span></div>")
     scope: true # because $index
     link: (scope, elem, attrs) ->
         menu = $parse(attrs.e2ButtonSet)(scope)
         if menu && menu.entries.length > 0
             group_class = menu.properties.group_class || ''
             brk = menu.properties.break
+            animation = menu.properties.animation
             out = ""
             for m, i in menu.entries
                 if i >= brk
@@ -477,6 +521,7 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
                 else if m.menu
                     out += button_set_arr_tmpl
                         dropdown: "#{attrs.e2ButtonSet}.entries[#{i}].menu.entries"
+                        animation: animation
                         icon: m.menu.icon && "#{E2Snippets.icon(m.menu.icon)}&nbsp;" || ''
                         aicon: m.menu.aicon && "#{E2Snippets.aicon(m.menu.aicon)}&nbsp;" || ''
                 else if m.divider
@@ -491,7 +536,13 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
                         loc: !(m.button_loc == false) && m.loc || ''
                         title: (m.button_loc == false) && "title=\"#{m.loc}\"" || ''
 
-            out += button_set_arr_tmpl dropdown: "#{attrs.e2ButtonSet}.entries.slice(#{brk})", icon: '', aicon: '' if menu.entries.length > brk
+            if menu.entries.length > brk
+                out += button_set_arr_tmpl
+                    dropdown: "#{attrs.e2ButtonSet}.entries.slice(#{brk})"
+                    animation: animation
+                    icon: ''
+                    aicon: ''
+
             out = "<div class='btn-group #{group_class}'>#{out}</div>"
             out = $compile(angular.element(out))(scope)
             if attrs.index && !scope.$index?

data/{views → app}/engine2actions.coffee

@@ -1,3 +1,4 @@
+'use strict'
 angular.module('Engine2')
 .directive 'e2Action', (E2Actions) ->
     scope: true
@@ -22,7 +23,7 @@ angular.module('Engine2')
                 $scope.action = new E2Actions.root(mresponse.data, $scope, null, $element, action_resource: 'api')
 
 .factory 'E2Actions', (E2, $http, $timeout, $e2Modal, $injector, $compile, $templateCache, $q, localStorageService, $route, $window, $rootScope, $location) ->
-    globals = {}
+    globals = E2.globals
     action: class Action
         constructor: (response, scope, parent, element, action_info) ->
             @find_action_info = (name, raise = true) ->
@@ -71,14 +72,17 @@ angular.module('Engine2')
 
         perform_invoke: (params) ->
             info = @action_info()
-            get_invoke = if info.invokable
-                params.initial = true if !@action_invoked && params && info.method == 'get'
+            get_invoke = if @meta.invokable == false then $q.when(data: (response: {})) else
+                (params ?= {}).initial = true if @meta.panel && !@action_invoked && info.method == 'get'
                 $http[info.method](info.action_resource, if info.method == 'post' then params else (params: params))
-            else $q.when(data: (response: {}))
 
             globals.action_pending = if @meta.panel then @ else @parent()
 
             get_invoke.then (response) =>
+                if exec = response.data.$execute
+                    @scope().$eval(exec)
+                    delete response.data.$execute
+
                 E2.merge(@, response.data)
                 @process_meta()
                 (if @meta.reload_routes then $route.load_routes() else $q.when({})).then =>
@@ -103,7 +107,7 @@ angular.module('Engine2')
             get_meta = if !info.terminal || info.meta
                 $http.get("#{info.action_resource}/meta", cache: true).then (response) =>
                     if info.recheck_access
-                        $http.get("#{info.action_resource}/meta", params: (access: true, parent_id: @current_id)).then (aresponse) ->
+                        $http.get("#{info.action_resource}/meta", params: (access: true, parent_id: @current_id())).then (aresponse) ->
                             response.data.actions[k].access = v for k, v of aresponse.data
                             response
                     else response # $q.when ^
@@ -113,8 +117,8 @@ angular.module('Engine2')
             ,
             (err) => @handle_error(err, info, el)
 
-        invoke_action: (name, arg) ->
-            @create_action(name, @scope()).then (act) -> act.invoke(arg)
+        invoke_action: (name, args) ->
+            @create_action(name, @scope()).then (act) -> act.invoke(args)
 
         create_action_path: (action_names, sc, elem) ->
             last_name = action_names.pop()
@@ -126,17 +130,23 @@ angular.module('Engine2')
         pre_invoke: ->
         post_invoke: ->
 
-        invoke: ->
-            args = arguments
-            @pre_invoke(args...)
-            @perform_invoke(args...).then (response) =>
-                @post_invoke(args...)
+        invoke: (args) ->
+            @pre_invoke(args)
+            _.merge(args ?= {}, @meta.arguments) if @meta.arguments
+            @perform_invoke(args).then =>
+                @post_invoke(args)
+                @scope().$eval(@meta.execute) if @meta.execute
+                if @meta.repeat
+                    unless @meta.destroy_repeat
+                        @scope().$on("$destroy", => delete @meta.repeat)
+                        @meta.destroy_repeat = true
+                    $timeout (=> @invoke(args)), @meta.repeat
                 @
 
         save_state: () ->
             _.each @meta.state, (s) => localStorageService.set("#{globals.application}/#{@action_info().action_resource}/#{s}", @[s])
         load_state: () ->
-            _.each @meta.state, (s) => E2.merge(@[s], localStorageService.get("#{globals.application}/#{@action_info().action_resource}/#{s}"))
+            _.each @meta.state, (s) => _.merge(@[s], localStorageService.get("#{globals.application}/#{@action_info().action_resource}/#{s}"))
 
         destroy: (e) ->
             console.log "DESTROY #{@action_info().action_resource}"
@@ -194,7 +204,7 @@ angular.module('Engine2')
     root: class RootAction extends Action
         initialize: ->
             super()
-            E2.merge(globals, @meta)
+            _.merge(globals, @meta)
             @meta  = {}
 
     default_action: class DefaultAction extends Action
@@ -266,10 +276,13 @@ angular.module('Engine2')
                 if route.menu then @register(route.menu.entries) else
                     name = '/' + route.name
                     route.href = '#' + route.name
-                    $templateCache.put(route.name, "<div e2-action='' action=\"'#{route.bootstrap}/#{route.name}'\" invoke='true'></div>") if route.bootstrap
+                    if route.bootstrap?
+                        action = if route.bootstrap == true then '' else route.bootstrap + '/'
+                        $templateCache.put(route.name + '_route_template!', "<div e2-action='' action=\"'#{action}#{route.name}'\" invoke='true'></div>")
+
                     $route.routes[name] =
                         reloadOnSearch: true
-                        templateUrl: route.name
+                        templateUrl: if route.bootstrap? then route.name + '_route_template!' else route.name
                         originalPath: name
                         regexp: new RegExp("^#{name}$")
                         keys: []
@@ -282,14 +295,16 @@ angular.module('Engine2')
 
         traverse: (routes) ->
             menu_tmpl = _.template("<li><a href='{{href}}'>{{icon}}{{aicon}} {{loc}}</a></li>")
-            menu_sub_tmpl = _.template("<li e2-drop-down='{{dropdown}}'><a href='javascript://'>{{icon}}{{aicon}} {{loc}}<span class='caret'></span></a></li>")
+            menu_sub_tmpl = _.template("<li e2-dropdown='{{dropdown}}' data-animation='{{animation}}'><a href='javascript://'>{{icon}}{{aicon}} {{loc}}<span class='caret'></span></a></li>")
+            animation = @meta.menus.menu.properties.animation
             out = routes.map (route, i) ->
                 if route.menu
                     menu_sub_tmpl
+                        dropdown: "routes[#{i}].menu.entries"
+                        animation: animation
                         icon: route.menu.icon && E2.icon(route.menu.icon) || ""
                         aicon: route.menu.aicon && E2.aicon(route.menu.aicon) || ""
                         loc: route.menu.loc
-                        dropdown: "routes[#{i}].menu.entries"
                 else
                     menu_tmpl
                         href: route.href
@@ -298,8 +313,6 @@ angular.module('Engine2')
                         aicon: route.aicon && E2.aicon(route.aicon) || ''
             out.join('')
 
-    # dummy: class DummyAction extends Action
-
     list: class ListAction extends Action
         initialize: ->
             super()
@@ -340,7 +353,7 @@ angular.module('Engine2')
         menu_show_meta: ->
             $e2Modal.show
                 the_meta: @meta
-                meta: panel: (panel_template: "close_m", template_string: "<pre>{{action.the_meta | json}}</pre>", title: "Meta", class: "modal-huge")
+                meta: panel: (panel_template: "close_m", template_string: "<pre>{{action.the_meta | json}}</pre>", title: "Meta", class: "modal-huge", backdrop: true, footer: true)
 
         # show_assoc: (index, assoc) ->
         #     # parent_id = E2.id_for(@entries[index], @meta)
@@ -350,14 +363,20 @@ angular.module('Engine2')
         #     @current_id = E2.id_for(@entries[index], @meta)
         #     @invoke_action(assoc)
 
+        current_entry: ->
+            @entries[@current_index]
+
+        current_id: ->
+            E2.id_for(@current_entry(), @meta)
+
         list_cell: (e, f) ->
             E2.render_field(e, f, @meta)
 
-        invoke: (arg = {}) ->
+        invoke: (args = {}) ->
             @save_state()
             query = _.cloneDeep(@query)
             delete query.search if _.isEmpty(E2.compact(query.search))
-            _.merge(query, arg)
+            _.merge(query, args)
             super(query).then =>
                 @ui = _.pick @query, ['order', 'asc', 'page']
                 @ui.pagination_active = @ui.page != 0 || @entries.length >= @meta.config.per_page
@@ -599,7 +618,7 @@ angular.module('Engine2')
             @multiple = @dinfo.render.multiple
             @clear_selected()
             @if_fk_values (fk_values) =>
-                @selected = if @multiple then E2.transpose(fk_values).map(E2.join_keys) else E2.join_keys(fk_values)
+                @selected = if @multiple then E2.transpose(fk_values).map((e) -> E2.join_keys(e)) else E2.join_keys(fk_values)
             @invoke()
 
         clear_selected: -> @selected = if @multiple then [] else null # no need to null complex keys
@@ -652,7 +671,7 @@ angular.module('Engine2')
 
         invoke_decode: (recs, f) ->
             if @multiple && _.size(recs) > @meta.show_max_selected
-                @decode = "#{_.size(recs)} #{@meta.decode_selected}"
+                @decode = "#{_.size(recs)} #{@meta.loc.decode_selected}"
             else
                 decode_descriptions = (recs) => @decode = recs.map((fields) => @decode_description(fields)).join(' | ')
                 recs = recs.map (r) => if _.isArray(r) then E2.from_id(r, @meta) else r
@@ -721,7 +740,7 @@ angular.module('Engine2')
     star_to_many_list: class StarToManyList extends ListAction
         initialize: ->
             super()
-            @query.parent_id = @parent().current_id
+            @query.parent_id = @parent().current_id()
 
         # link_list: implicit
         item_menu_confirm_unlink: (index) ->
@@ -786,8 +805,8 @@ angular.module('Engine2')
                 @panel_close()
 
     star_to_many_field_unlink: class StarToManyFieldUnlink extends Action
-        invoke: (arg) ->
-            id = arg.id
+        invoke: (args) ->
+            id = args.id
             pparent = @parent().parent()
             if _.includes(pparent.links.linked, id) then _.pull(pparent.links.linked, id) else pparent.links.unlinked.push id
             pparent.sync_record()