Merge pull request #252 from girder/add-template-user

Add an option to include the user in a templated field

Author: manthey

README.rst

@@ -171,10 +171,12 @@ The following template values are handled identically for all parameters:
 - ``{{task}}``: the internal task name (this usually doesn't have spaces in it)
 - ``{{image}}``: the tag of the Docker image used for the task
 - ``{{now}}``: the local time the job started in the form yyyymmdd-HHMMSS.  You can use ``yyyy``, ``mm``, ``dd``, ``HH``, ``MM``, ``SS`` for the four digit year, and two digit month, day, 24-hour, minute, and second.
+- ``{{user}}``: the login name of the current user.
 - ``{{parameter_<name of cli parameter>}}``: any parameter that isn't templated can be referenced by its name.  For instance, in Example1 in the small-docker cli in this repo, ``{{parameter_stringChoice}}`` would get replaced by the value passed to the stringChoice parameter.
 - ``{{parameter_<name of cli parameter>_base}}`` is the same as the previous item except that if the right-most part of the parameter looks like a file extension, it is removed.  This can be used to get the base name of file parameters.
 
 The following template parameters are only handled on the web client:
+
 - ``{#control:<selector>#}``: If specified for the value of a parameter, use the value of the selected field from the DOM.  For instance, ``{#control:.h-zoom-value#}`` could get the current image zoom level.
 
 There are also template values specific to individual parameters:

slicer_cli_web/rest_slicer_cli.py

@@ -422,6 +422,7 @@ def cliSubHandler(currentItem, params, user, token, datalist=None):
             'HH': time.strftime('%H', now),
             'MM': time.strftime('%M', now),
             'SS': time.strftime('%S', now),
+            'user': user['login'] if user else '',
         }
 
         sub_index_params, sub_opt_params = index_params, opt_params

slicer_cli_web/web_client/collections/WidgetCollection.js

@@ -23,7 +23,7 @@ const WidgetCollection = Backbone.Collection.extend({
                     break;
                 case 'multi':
                 case 'new-file':
-                    if (m && m.value && m.value()) {
+                    if (m && m.value && m.value() && m.value().get) {
                         params[m.id + '_folder'] = m.value().get('folderId');
                         params[m.id] = m.value().get('name');
                     }

slicer_cli_web/web_client/models/WidgetModel.js

@@ -225,7 +225,7 @@ const WidgetModel = Backbone.Model.extend({
      * the model on the server.
      */
     _validateGirderModel(model) {
-        if (!model.value || !model.value.get('name')) {
+        if (!model.value || (model.value.get && !model.value.get('name'))) {
             if (!this.get('required')) {
                 return;
             }
@@ -234,6 +234,9 @@ const WidgetModel = Backbone.Model.extend({
 
         switch (this.get('type')) {
             case 'new-file':
+                if (!model.value.get) {
+                    break;
+                }
                 if (!model.parent || model.parent.resourceName !== 'folder') {
                     return 'Invalid parent model';
                 }

slicer_cli_web/web_client/views/ControlWidget.js

@@ -336,7 +336,8 @@ const ControlWidget = View.extend({
         let modelType = 'folder'; // folder type by default, other types if necessary
         let modelId = null;
         // If it is an item it will have a folderId associated with it as a parent item
-        if (resource.get('itemId')) {
+        if (!resource.get) {
+        } else if (resource.get('itemId')) {
             modelId = resource.get('itemId');
             modelType = 'item';
         } else if (resource.get('folderId')) {