mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-03 20:02:47 +00:00 
			
		
		
		
	Merge branch 'following-mechanics' into development
This commit is contained in:
		@@ -17,7 +17,7 @@ class CorpusFileList extends ResourceList {
 | 
			
		||||
      });
 | 
			
		||||
    });
 | 
			
		||||
    app.getUser(this.userId).then((user) => {
 | 
			
		||||
      this.add(Object.values(user.corpora[this.corpusId].files));
 | 
			
		||||
      this.add(Object.values(user.corpora[this.corpusId].files || user.followed_corpora[this.corpusId].files));
 | 
			
		||||
      this.isInitialized = true;
 | 
			
		||||
    });
 | 
			
		||||
  }
 | 
			
		||||
 
 | 
			
		||||
@@ -1,7 +1,7 @@
 | 
			
		||||
class UserList extends ResourceList {
 | 
			
		||||
  static autoInit() {
 | 
			
		||||
    for (let publicUserListElement of document.querySelectorAll('.user-list:not(.no-autoinit)')) {
 | 
			
		||||
      new UserList(publicUserListElement);
 | 
			
		||||
    for (let userListElement of document.querySelectorAll('.user-list:not(.no-autoinit)')) {
 | 
			
		||||
      new UserList(userListElement);
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@@ -41,14 +41,14 @@ class UserList extends ResourceList {
 | 
			
		||||
 | 
			
		||||
  initListContainerElement() {
 | 
			
		||||
    if (!this.listContainerElement.hasAttribute('id')) {
 | 
			
		||||
      this.listContainerElement.id = Utils.generateElementId('public-user-list-');
 | 
			
		||||
      this.listContainerElement.id = Utils.generateElementId('user-list-');
 | 
			
		||||
    }
 | 
			
		||||
    let listSearchElementId = Utils.generateElementId(`${this.listContainerElement.id}-search-`);
 | 
			
		||||
    this.listContainerElement.innerHTML = `
 | 
			
		||||
      <div class="input-field">
 | 
			
		||||
        <i class="material-icons prefix">search</i>
 | 
			
		||||
        <input id="${listSearchElementId}" class="search" type="text"></input>
 | 
			
		||||
        <label for="${listSearchElementId}">Search public user</label>
 | 
			
		||||
        <label for="${listSearchElementId}">Search user</label>
 | 
			
		||||
      </div>
 | 
			
		||||
      <table>
 | 
			
		||||
        <thead>
 | 
			
		||||
@@ -77,7 +77,7 @@ class UserList extends ResourceList {
 | 
			
		||||
      'full-name': user.full_name ? user.full_name : '',
 | 
			
		||||
      'location': user.location ? user.location : '',
 | 
			
		||||
      'organization': user.organization ? user.organization : '',
 | 
			
		||||
      'corpora-online': '0'
 | 
			
		||||
      'corpora-online': '-'
 | 
			
		||||
    };
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user