Changes to the admin_edit.

Moved the sidebar to catinclude, and changed templates in modules accordingly.
Also a few new functions in m_identity.

modules/mod_admin/templates/admin_edit.tpl

@@ -281,7 +281,7 @@
 							</div>
 						</div>
 
-						{% all include "_admin_edit_sidebar.tpl" %}
+						{% all catinclude "_admin_edit_sidebar.tpl" id %}
 
 						{% if not r.is_a.meta %}
 						<div class="item-wrapper" id="sort-date">

modules/mod_admin_event/templates/_admin_edit_sidebar.tpl → modules/mod_admin_event/templates/_admin_edit_sidebar.artist.tpl

@@ -1,5 +1,3 @@
-{% if m.rsc[id].is_a.artist %}
-
 <div class="item-wrapper" id="sort-user-credentials">
 	<h3 class="above-item clearfix do_blockminifier">
 		<span class="title">Events for this artist</span>
@@ -33,5 +31,3 @@
 		</div>
 	</div>
 </div>
-
-{% endif %}

modules/mod_admin_group/templates/_admin_edit_content.tpl → modules/mod_admin_group/templates/_admin_edit_content.group.tpl

@@ -1,5 +1,4 @@
-{% if r.is_a.group %}
-	{% with m.group[r.id] as g %}
+{% with m.group[r.id] as g %}
 		<div class="item-wrapper">
 			<h3 class="above-item clearfix do_blockminifier { minifiedOnInit: false }">
 				<span class="title">Additional site wide rights</span>
@@ -53,5 +52,4 @@
 				</fieldset>
 			</div>
 		</div>
-	{% endwith %}
-{% endif %}
+{% endwith %}

modules/mod_admin_group/templates/_admin_edit_sidebar.tpl → modules/mod_admin_group/templates/_admin_edit_sidebar.group.tpl

@@ -1,5 +1,3 @@
-{% if m.rsc[id].is_a.group %}
-
 {% sortable id="sort-group_members" %}
 
 <div class="item-wrapper" id="sort-group_members">
@@ -20,5 +18,3 @@
 		{% button text="View group members" action={redirect dispatch="admin_group_members" id=id} %}
 	</div>
 </div>
-
-{% endif %}

modules/mod_admin_predicate/templates/_admin_edit_content.tpl → modules/mod_admin_predicate/templates/_admin_edit_content.predicate.tpl

@@ -1,5 +1,4 @@
-{% if r.is_a.predicate %}
-	{% with m.predicate[id] as p %}
+{% with m.predicate[id] as p %}
 		<div class="item-wrapper">
 			<h3 class="above-item clearfix do_blockminifier { minifiedOnInit: false }">
 				<span class="title">Valid between</span>
@@ -51,5 +50,4 @@
 				</fieldset>
 			</div>
 		</div>
-	{% endwith %}
-{% endif %}
+{% endwith %}

modules/mod_mailinglist/templates/_admin_edit_sidebar.tpl → modules/mod_mailinglist/templates/_admin_edit_sidebar.mailinglist.tpl

@@ -1,4 +1,3 @@
-{% if r.is_a.mailinglist %}
 <div class="item-wrapper">
 	<h3 class="above-item clearfix do_blockminifier { minifiedOnInit: false }">
 		<span class="title">Mailing list</span>
@@ -44,4 +43,3 @@
 		</div>
 	</div>
 </div>
-{% endwith %}

src/models/m_identity.erl

@@ -35,7 +35,14 @@
     set_username_pw/4,
     check_username_pw/3,
     hash/1,
-    hash_is_equal/2
+    hash_is_equal/2,
+    get_rsc/2,
+    get_rsc/3,
+
+    lookup_by_type_and_key/3,
+
+    insert/4,
+    delete/2
 ]).
 
 -include_lib("zotonic.hrl").
@@ -176,7 +183,7 @@ get_rsc(Id, Context) ->
     z_db:assoc("select * from identity where rsc_id = $1", [Id], Context).
 
 get_rsc(Id, Type, Context) ->
-    z_db:assoc_row("select * from identity where rsc_id = $1 and type = '$2'", [Id, Type], Context).
+    z_db:assoc_row("select * from identity where rsc_id = $1 and type = $2", [Id, Type], Context).
 
 
 %% @doc Hash a password, using sha1 and a salt
@@ -195,3 +202,13 @@ hash_is_equal(Pw, {hash, Salt, Hash}) ->
 hash_is_equal(_, _) ->
     false.
 
+%% @doc Create an identity record.
+insert(RscId, Type, Key, Context) ->
+    Props = [{rsc_id, RscId}, {type, Type}, {key, Key}],
+    z_db:insert(identity, Props, Context).
+
+delete(IdnId, Context) ->
+    z_db:delete(identity, IdnId, Context).
+
+lookup_by_type_and_key(Type, Key, Context) ->
+    z_db:assoc_row("select * from identity where type = $1 and key = $2", [Type, Key], Context).