Merge pull request #275 from ikedas/issue-11_trial4 by ikedas

#11: Spurious error on duplicate keys with admin sync, and changes on configuration for owners/moderators
sympa-community · Apr 30, 2018 · 1d6b19e · 1d6b19e
2 parents 91bfffa + d7bab5f
commit 1d6b19e
Show file tree

Hide file tree

Showing 13 changed files with 999 additions and 448 deletions.
diff --git a/default/web_tt2/edit.tt2 b/default/web_tt2/edit.tt2
@@ -0,0 +1,110 @@
+<!-- edit.tt2 -->
+<h2>
+[% IF role == 'owner' ~%]
+  [%|loc%]Owner[%END%]
+[%~ ELSIF role == 'editor' ~%]
+  [%|loc%]Moderator[%END%]
+[%~ ELSE ~%]
+  [% RETURN %]
+[%~ END %]
+</h2>
+
+<form action="[% path_cgi %]" method="post">
+<fieldset>
+[% SET pV = config_values.${role}.0 ~%]
+
+  <input type="hidden" name="previous_action" value="[% previous_action %]" />
+  <input type="hidden" name="list" value="[% list %]" />
+  <input type="hidden" name="role" value="[% role %]" />
+  <input type="hidden" name="email" value="[% pV.email %]" />
+
+<div class="row">
+
+<div class="columns">
+  <label for="email">[%|loc%]Email:[%END%]  </label>
+  [% pV.email %]
+</div>
+
+<div class="columns">
+  <label for="gecos">[%|loc%]Name:[%END%]  </label>
+  <input type="text" name="single_param.[% role %].0.gecos" id="gecos"
+   value="[% pV.gecos %]" size="25" />
+</div>
+
+[% IF is_privileged_owner ~%]
+  <div class="columns">
+    <label for="info">[%|loc%]private information[%END%]  </label>
+    <input type="text" name="single_param.[% role %].0.info" id="info"
+     value="[% pV.info %]" size="30" />
+  </div>
+[%~ END %]
+
+[% IF role == 'owner' ~%]
+  <div class="columns">
+    <label for="profile">[%|loc%]profile[%END%]  </label>
+    [% IF is_listmaster ~%]
+      <select name="single_param.[% role %].0.profile" id="profile">
+      [% FOREACH r = ['normal', 'privileged'] ~%]
+        <option value="[% r %]"
+         [%~ IF r == pV.profile %] selected="selected"[% END ~%]
+        >
+        [%~ r | optdesc ~%]
+        </option>
+      [% END %]
+      </select>
+    [%~ ELSE  ~%]
+      [% pV.profile | optdesc %]
+    [%~ END %]
+  </div>
+[%~ END %]
+
+<div class="columns">
+  <label for="reception">[%|loc%]Receiving:[%END%]  </label>
+  <select name="single_param.[% role %].0.reception" id="reception">
+  [% FOREACH r = ['mail', 'nomail'] ~%]
+    <option value="[% r %]"
+     [%~ IF r == pV.reception %] selected="selected"[% END ~%]
+    >
+    [%~ r | optdesc ~%]
+    </option>
+  [% END %]
+  </select>
+</div>
+
+<div class="columns">
+  <label for="visibility">[%|loc%]Visibility:[%END%]  </label>
+  <select id="visibility" name="single_param.[% role %].0.visibility">
+  [% FOREACH r = ['noconceal', 'conceal'] ~%]
+    <option value="[% r %]"
+     [%~ IF r == pV.visibility %] selected="selected"[% END ~%]
+    >
+    [%~ r | optdesc ~%]
+    </option>
+  [% END %]
+  </select>
+</div>
+
+<div class="columns">
+  <label>[%|loc%]Delegated since:[%END%] </label>
+  [% pV.date | optdesc('unixtime') %]
+</div>
+
+<div class="columns">
+  <label>[%|loc%]Last update:[%END%] </label>
+  [% pV.update_date | optdesc('unixtime') %]
+</div>
+
+[% IF is_privileged_owner ~%]
+  <input type="hidden" name="submit" value="submit" />
+  <div class="columns">
+    <input class="MainMenuLinks" type="submit" name="action_edit"
+     value="[%|loc%]Update[%END%]" />
+  </div>
+[%~ END %]
+
+</div>
+
+</fieldset>
+</form>
+
+<!-- end edit.tt2 -->
diff --git a/default/web_tt2/info.tt2 b/default/web_tt2/info.tt2
@@ -56,7 +56,12 @@
         <div class="item_content">
           <a class="item_title" href="[% 'admin' | url_rel([list]) %]"><i class="fa fa-wrench fa-3x pull-left fa-border"></i> [%|loc%]List Configuration[%END%]</a>
           <ul class="fa-ul">
-            <li><i class="fa-li fa fa-arrow-right"></i><a href="[% 'edit_list_request' | url_rel([list,'description']) %]">[%|loc%]Modify owners or moderators (editors)[%END%]</a></li>
+            <li>
+              <i class="fa-li fa fa-arrow-right"></i>
+              <a href="[% 'review' | url_rel([list,'owner']) %]">
+                [%|loc%]Modify owners or moderators (editors)[%END%]
+              </a>
+            </li>
             <li><i class="fa-li fa fa-arrow-right"></i><a href="[% 'edit_list_request' | url_rel([list,'description']) %]">[%|loc%]Modify list subject and visibility[%END%]</a></li>
             <li><i class="fa-li fa fa-arrow-right"></i><a href="[% 'edit_list_request' | url_rel([list,'sending']) %]">[%|loc%]Change who can post to this list[%END%]</a></li>
             <li><i class="fa-li fa fa-arrow-right"></i><a href="[% 'edit_list_request' | url_rel([list,'command']) %]">[%|loc%]Change who can (un)subscribe and view list information[%END%]</a></li>

diff --git a/default/web_tt2/list_panel.tt2 b/default/web_tt2/list_panel.tt2
@@ -43,7 +43,10 @@
 
     [% IF is_priv %]
       <span>
-        <a href="[% 'edit_list_request' | url_rel([list,'description'],{},'owner') %]"><i class="fa fa-pencil-square fa-lg" title="[%|loc%](Edit)[%END%]"></i></a>
+        <a href="[% 'review' | url_rel([list,'owner']) %]">
+          <i class="fa fa-pencil-square fa-lg" title="[%|loc%](Edit)[%END%]">
+          </i>
+        </a>
       </span>
     [% END %]
   </span>
@@ -78,7 +81,10 @@
 
     [% IF is_priv %]
       <span>
-        <a href="[% 'edit_list_request' | url_rel([list,'description'],{},'editor') %]"><i class="fa fa-pencil-square fa-lg" title="[%|loc%](Edit)[%END%]"></i></a>
+        <a href="[% 'review' | url_rel([list,'editor']) %]">
+          <i class="fa fa-pencil-square fa-lg" title="[%|loc%](Edit)[%END%]">
+          </i>
+        </a>
       </span>
     [% END %]
   </span>

diff --git a/default/web_tt2/nav.tt2 b/default/web_tt2/nav.tt2
@@ -141,10 +141,30 @@
              <li class="[% class %]"><a href="[% 'edit_list_request' | url_rel([list,'other']) %]" >[%|loc%]Miscellaneous[%END%]</a></li>
           </ul>
     </li>
-[% IF is_owner %]
-[% IF action == 'review' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
-    <li class="[% class %]"><a  href="[% 'review' | url_rel([list]) %]">[%|loc%]Manage Subscribers[%END%]</a></li>
-[% END %]
+  [% IF is_owner ~%]
+    <li class="has-dropdown [% IF action == 'review' %]active[%END%]">
+      <a href="#">
+        [%|loc%]Users[%END%]
+      </a>
+      <ul class="dropdown">
+        <li [% IF page.match('^\d+$') %]class="active"[%END%]>
+          <a  href="[% 'review' | url_rel([list]) %]" >
+            [%|loc%]Subscribers[%END%]
+          </a>
+        </li>
+        <li [% IF page == 'owner' %]class="active"[%END%]>
+          <a  href="[% 'review' | url_rel([list,'owner']) %]" >
+            [%|loc%]Owners[%END%]
+          </a>
+        </li>
+        <li [% IF page == 'editor' %]class="active"[%END%]>
+          <a  href="[% 'review' | url_rel([list,'editor']) %]" >
+            [%|loc%]Editors[%END%]
+          </a>
+        </li>
+      </ul>
+    </li>
+  [%~ END %]
 [% IF conf.use_blacklist != 'none' %]
 [% IF action == 'blacklist' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
     <li class="[% class %]"><a  href="[% 'blacklist' | url_rel([list]) %]" >[%|loc%]Blacklist[%END%]</a></li>