Fix bug introduced by last commit.

Need to handle MODEL_COL_FIELD before COL_FIELD.

Author: c0bra

src/features/edit/js/gridEdit.js

@@ -668,8 +668,7 @@
               //get original value from the cell
               origCellValue = cellModel($scope);
 
-              html = $scope.col.editableCellTemplate
-                        .replace(uiGridConstants.COL_FIELD, 'grid.getCellValue(row, col)');
+              html = $scope.col.editableCellTemplate;
 
               if ($scope.col.colDef.editModelField) {
                 html = html.replace(uiGridConstants.MODEL_COL_FIELD, gridUtil.preEval('row.entity.' + $scope.col.colDef.editModelField));
@@ -678,6 +677,8 @@
                 html = html.replace(uiGridConstants.MODEL_COL_FIELD, $scope.row.getQualifiedColField($scope.col));
               }
 
+              html = html.replace(uiGridConstants.COL_FIELD, 'grid.getCellValue(row, col)');
+
               var optionFilter = $scope.col.colDef.editDropdownFilter ? '|' + $scope.col.colDef.editDropdownFilter : '';
               html = html.replace(uiGridConstants.CUSTOM_FILTERS, optionFilter);