Sunset intake module 🫡

UtrechtUniversity · Nov 18, 2024 · 7f977fe · 7f977fe
1 parent 9dc0484
commit 7f977fe
Show file tree

Hide file tree

Showing 67 changed files with 2 additions and 5,681 deletions.
diff --git a/app.py b/app.py
@@ -19,7 +19,6 @@
 from fileviewer.fileviewer import fileviewer_bp
 from general.general import general_bp
 from group_manager.group_manager import group_manager_bp
-from intake.intake import intake_bp
 from monitor import Monitor
 from open_search.open_search import open_search_bp
 from research.research import research_bp
@@ -99,10 +98,6 @@ def load_admin_setting() -> Dict[str, Any]:
     app.config['modules'].append(
         {'name': 'Deposit', 'function': 'deposit_bp.index'}
     )
-if app.config.get('INTAKE_ENABLED'):
-    app.config['modules'].append(
-        {'name': 'Intake', 'function': 'intake_bp.index'}
-    )
 if app.config.get('DATAREQUEST_ENABLED'):
     app.config['modules'].append(
         {'name': 'Datarequest', 'function': 'datarequest_bp.index'}
@@ -153,8 +148,6 @@ def load_admin_setting() -> Dict[str, Any]:
         app.register_blueprint(deposit_bp, url_prefix='/deposit')
     if app.config.get('OPEN_SEARCH_ENABLED'):
         app.register_blueprint(open_search_bp, url_prefix='/open_search')
-    if app.config.get('INTAKE_ENABLED'):
-        app.register_blueprint(intake_bp, url_prefix='/intake')
     if app.config.get('DATAREQUEST_ENABLED'):
         app.register_blueprint(datarequest_bp, url_prefix='/datarequest/')
 

diff --git a/group_manager/templates/group_manager/index.html b/group_manager/templates/group_manager/index.html
@@ -107,15 +107,11 @@ <h1 id="group-manager-text">Group manager</h1>
                                     <div class="input-group-btn" id="f-group-create-prefix-div" title="Choose a group type">
                                         <button type="button" id="f-group-create-prefix-button" class="btn btn-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><span class="text">research-&nbsp;</span><span class="caret"></span></button>
                                         <ul class="dropdown-menu">
-                                            <li id="f-group-create-prefix-grp"><a href="#" data-value="grp-">grp-&nbsp;</a></li>
                                             <li id="f-group-create-prefix-datamanager"><a href="#" data-value="datamanager-">datamanager-&nbsp;</a></li>
                                             <li><a href="#" data-value="research-">research-&nbsp;</a></li>
                                             {% if config.get('DEPOSIT_ENABLED', False) %}
                                             <li id="f-group-create-prefix-deposit"><a href="#" data-value="deposit-">deposit-&nbsp;</a></li>
                                             {% endif %}
-                                            {% if config.get('INTAKE_ENABLED', False) %}
-                                                <li><a href="#" data-value="intake-">intake-&nbsp;</a></li>
-                                            {% endif %}
                                         </ul>
                                     </div>
                                     <input name="group_name" id="f-group-create-name" class="form-control" type="text" pattern="^([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$" required oninvalid="setCustomValidity('Please enter only lowercase letters, numbers, and hyphens (-). The group name may not start or end with a hyphen.')" onchange="setCustomValidity('')" />
@@ -220,7 +216,7 @@ <h1 id="group-manager-text">Group manager</h1>
                             <div class="col-sm-8">
                                 <div class="input-group">
                                     <div class="input-group-prepend">
-                                        <span class="input-group-text" id="inputGroupPrepend">grp-</span>
+                                        <span class="input-group-text" id="inputGroupPrepend">research-</span>
                                     </div>
                                     <input name="group_name" id="f-group-update-name" class="form-control" type="text" pattern="^([a-z0-9]|[a-z0-9][a-z0-9\-]*[a-z0-9])$" required oninvalid="setCustomValidity('Please enter only lowercase letters, numbers, and hyphens (-). The group name may not start or end with a hyphen.')" onchange="setCustomValidity('')" disabled />
                                 </div>

diff --git a/intake/intake.py b/intake/intake.py
diff --git a/intake/static/intake/css/datatables.bootstrap.min.css b/intake/static/intake/css/datatables.bootstrap.min.css