mirror of
				https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
				synced 2025-11-04 04:12:45 +00:00 
			
		
		
		
	Merge branch 'profile-page' into development
This commit is contained in:
		@@ -24,6 +24,8 @@
 | 
			
		||||
  'js/RessourceLists/JobList.js',
 | 
			
		||||
  'js/RessourceLists/JobInputList.js',
 | 
			
		||||
  'js/RessourceLists/JobResultList.js',
 | 
			
		||||
  'js/RessourceLists/PublicCorporaList.js',
 | 
			
		||||
  'js/RessourceLists/PublicUserList.js',
 | 
			
		||||
  'js/RessourceLists/SpacyNLPPipelineModelList.js',
 | 
			
		||||
  'js/RessourceLists/TesseractOCRPipelineModelList.js',
 | 
			
		||||
  'js/RessourceLists/UserList.js',
 | 
			
		||||
 
 | 
			
		||||
@@ -22,11 +22,7 @@
 | 
			
		||||
{% block scripts %}
 | 
			
		||||
{{ super() }}
 | 
			
		||||
<script>
 | 
			
		||||
  for (let user of {{ json_users|tojson }}) {
 | 
			
		||||
    if (user.id in app.data.users) {continue;}
 | 
			
		||||
    app.data.users[user.id] = user;
 | 
			
		||||
  }
 | 
			
		||||
  let userList = new UserList(document.querySelector('.user-list'));
 | 
			
		||||
  userList.init(app.data.users);
 | 
			
		||||
  userList._init({{ json_users|tojson }});
 | 
			
		||||
</script>
 | 
			
		||||
{% endblock scripts %}
 | 
			
		||||
 
 | 
			
		||||
@@ -49,6 +49,7 @@
 | 
			
		||||
          <div class="card-content">
 | 
			
		||||
            <span class="card-title">Other users and groups</span>
 | 
			
		||||
            <p>Find other users and follow them to see their corpora and groups.</p>
 | 
			
		||||
            <div class="public-user-list no-autoinit"></div>
 | 
			
		||||
          </div>
 | 
			
		||||
        </div>
 | 
			
		||||
      </div>
 | 
			
		||||
@@ -115,3 +116,11 @@
 | 
			
		||||
  </div>
 | 
			
		||||
</div>
 | 
			
		||||
{% endblock modals %}
 | 
			
		||||
 | 
			
		||||
{% block scripts %}
 | 
			
		||||
{{ super() }}
 | 
			
		||||
<script>
 | 
			
		||||
  let publicUserList = new PublicUserList(document.querySelector('.public-user-list'));
 | 
			
		||||
  publicUserList._init({{ users|tojson }});
 | 
			
		||||
</script>
 | 
			
		||||
{% endblock scripts %}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user