<commit_before>(function() {
  'use strict';
  angular.module('civic.events.common')
    .controller('EditableFieldFlagController', EditableFieldFlagController)
    .directive('editableFieldFlag', editableFieldFlag);

  // @ngInject
  function editableFieldFlag() {

    return {
      restrict: 'E',
      scope: {
        entityId: '=',
        flag: '=',
        type: '=',
        name: '=',
        resolveFn: '='
      },
      controller: 'EditableFieldFlagController',
      templateUrl: 'app/views/events/common/editableFieldFlag.tpl.html'
    };
  }

  // @ngInject
  function EditableFieldFlagController($scope, $state, _, Security) {
    var ctrl = $scope.ctrl = {};
    console.log('editable field flag controller called. ----------------');
    ctrl.isAdmin = Security.isAdmin;
    ctrl.isEditor = Security.isEditor;
    ctrl.actions = {
      flagged: {
        order: 0,
        timestamp: $scope.flag.flagComment.created_at,
        user: $scope.flag.flagging_user
      }
    };

    if(!_.isUndefined($scope.flag.resolving_user.id)) {
      ctrl.actions.resolved = {
        order: 1,
        timestamp: $scope.flag.resolveComment.created_at,
        user: $scope.flag.flagging_user
      };
    }

    ctrl.resolveFlag = {
      entityId: $scope.entityId,
      flagId: $scope.flag.id,
      comment: {
        title: 'Flag Resolve Comment for ' + $scope.type + ' ' + $scope.name,
        text: ''
      }
    };
  }
})();
<commit_msg>resolved flags now properly show the resolving user<commit_after>(function() {
  'use strict';
  angular.module('civic.events.common')
    .controller('EditableFieldFlagController', EditableFieldFlagController)
    .directive('editableFieldFlag', editableFieldFlag);

  // @ngInject
  function editableFieldFlag() {

    return {
      restrict: 'E',
      scope: {
        entityId: '=',
        flag: '=',
        type: '=',
        name: '=',
        resolveFn: '='
      },
      controller: 'EditableFieldFlagController',
      templateUrl: 'app/views/events/common/editableFieldFlag.tpl.html'
    };
  }

  // @ngInject
  function EditableFieldFlagController($scope, $state, _, Security) {
    var ctrl = $scope.ctrl = {};
    console.log('editable field flag controller called. ----------------');
    ctrl.isAdmin = Security.isAdmin;
    ctrl.isEditor = Security.isEditor;
    ctrl.actions = {
      flagged: {
        order: 0,
        timestamp: $scope.flag.flagComment.created_at,
        user: $scope.flag.flagging_user
      }
    };

    if(!_.isUndefined($scope.flag.resolving_user.id)) {
      ctrl.actions.resolved = {
        order: 1,
        timestamp: $scope.flag.resolveComment.created_at,
        user: $scope.flag.resolving_user
      };
    }

    ctrl.resolveFlag = {
      entityId: $scope.entityId,
      flagId: $scope.flag.id,
      comment: {
        title: 'Flag Resolve Comment for ' + $scope.type + ' ' + $scope.name,
        text: ''
      }
    };
  }
})();

{'fraction_non_alphanumeric': 0.1512377076975246, 'fraction_numerical': 0.0013563919972872161, 'mean_word_length': 2.3446712018140587, 'pattern_counts': {'":': 0, '<': 3, '<?xml version=': 0, '>': 3, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '5993681', 'n_tokens_mistral': 927, 'n_tokens_neox': 919, 'n_words': 149}